summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-05-03 17:53:49 +0200
committerUlf Hermann <ulf.hermann@qt.io>2016-05-17 08:44:58 +0000
commit113e78a4beccdf717d484279baab08be8d805201 (patch)
tree6d8f976a03cbed05ade03b59062f48243d8384ce
parent2acd5a028458c737b6bf6435bd38fb9eb7b01ab9 (diff)
Fix cmake test case
QtQuick or QML are not required, but scxml is. Also, we should check for a real class to verify the module is there. Task-number: QTBUG-51420 Change-Id: Ic6b6086bfba318933139f4bfd04826980c3716d4 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r--tests/auto/cmake/CMakeLists.txt5
-rw-r--r--tests/auto/cmake/cmake.pro2
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 30ea1f7..8518d09 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -5,12 +5,9 @@ project(qmake_cmake_files)
enable_testing()
find_package(Qt5Core REQUIRED)
-find_package(Qt5Qml REQUIRED)
-find_package(Qt5Quick REQUIRED)
-
include("${_Qt5CTestMacros}")
test_module_includes(
- QScxml
+ Scxml QScxmlEvent
)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index 180ba7e..e91ff69 100644
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -1,6 +1,6 @@
# Cause make to do nothing.
TEMPLATE = subdirs
-CMAKE_QT_MODULES_UNDER_TEST = qscxml
+CMAKE_QT_MODULES_UNDER_TEST = scxml
CONFIG += ctest_testcase