From ab9661c1dd4340af5a84244c920d94bddd1c8e90 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Wed, 29 Feb 2012 07:55:31 -0700
Subject: [PATCH] Remove QtGui dependency in Qt4Deploy test and verify QtSql
 existance.

---
 Tests/CMakeLists.txt           | 2 +-
 Tests/Qt4Deploy/CMakeLists.txt | 2 +-
 Tests/Qt4Deploy/testdeploy.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc2ae5e6c..13e57d965 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -268,7 +268,7 @@ IF(BUILD_TESTING)
 
     # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
     # this test also depends on the existence of the standard qtiff plugin
-    if(QT4_WORKS)
+    if(QT4_WORKS AND QT_QTSQL_FOUND)
       ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
         --build-and-test
         "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
diff --git a/Tests/Qt4Deploy/CMakeLists.txt b/Tests/Qt4Deploy/CMakeLists.txt
index ccacf749a..646ea9f3b 100644
--- a/Tests/Qt4Deploy/CMakeLists.txt
+++ b/Tests/Qt4Deploy/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(Qt4Deploy)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
 
-find_package(Qt4 REQUIRED QtMain QtCore QtGui QtSql)
+find_package(Qt4 REQUIRED QtMain QtCore QtSql)
 include(${QT_USE_FILE})
 
 add_executable(testdeploy MACOSX_BUNDLE testdeploy.cpp)
diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp
index bcf77a222..8b9c8d6fa 100644
--- a/Tests/Qt4Deploy/testdeploy.cpp
+++ b/Tests/Qt4Deploy/testdeploy.cpp
@@ -1,8 +1,8 @@
 #include <QCoreApplication>
-#include <QImageReader>
 #include <QSqlDatabase>
 #include <QLibraryInfo>
 #include <QDebug>
+#include <QStringList>
 
 int main(int argc, char** argv)
 {