diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2012-02-29 14:55:31 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2012-02-29 14:55:31 (GMT) |
| commit | ab9661c1dd4340af5a84244c920d94bddd1c8e90 (patch) | |
| tree | ee7dce2f71577effa1e84efe0bab6dbb3d723897 | |
| parent | 52e827964843cdf25ec3be1af98cb47c17800545 (diff) | |
| download | CMake-ab9661c1dd4340af5a84244c920d94bddd1c8e90.zip CMake-ab9661c1dd4340af5a84244c920d94bddd1c8e90.tar.gz CMake-ab9661c1dd4340af5a84244c920d94bddd1c8e90.tar.bz2 | |
Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Qt4Deploy/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Qt4Deploy/testdeploy.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index cc2ae5e..13e57d9 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 ccacf74..646ea9f 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 bcf77a2..8b9c8d6 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) { |