diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /tests/auto/cmake | |
parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index b2639f5e0b..677e6a6330 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -64,7 +64,7 @@ expect_pass("test(needsquoting)dirname") expect_pass(test_platform_defs_include) expect_pass(test_qtmainwin_library) -# If QtDBus has been installed then run the tests for its macros. +# If Qt D-Bus has been installed then run the tests for its macros. find_package(Qt5DBus QUIET) if (Qt5DBus_FOUND AND NOT APPLE) expect_pass(test_dbus_module) diff --git a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt index aa93d73fec..571fadcfb6 100644 --- a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt @@ -31,10 +31,10 @@ qt5_generate_moc("${main_file}" "${moc_file}") # The core_test is expected to fail to build because # QT_GUI_LIB is defined, which affects the contents of -# QtTest and the definition of QTEST_MAIN. +# Qt Test and the definition of QTEST_MAIN. # If running this test manually (ctest -V -R no_link_gui from # the tests/auto/cmake/build directory), the core_test is -# expected to fail to link because of missing symbols from QtGui. +# expected to fail to link because of missing symbols from Qt GUI. # The gui_test is expected to build successfully (though it may # be necessary to comment out the core_test and re-run cmake) add_executable(core_test "${main_file}" "${moc_file}") diff --git a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt index 9b120ecba0..8c025d65cd 100644 --- a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt @@ -34,8 +34,8 @@ qt5_generate_moc("${main_file}" "${moc_file}") # QtTest and the definition of QTEST_MAIN. # If running this test manually (ctest -V -R no_link_widgets from # the tests/auto/cmake/build directory), the core_test is -# expected to fail to link because of missing symbols from QtGui -# and QtWidgets. +# expected to fail to link because of missing symbols from Qt GUI +# and Qt Widgets. # The widgets_test is expected to build successfully (though it may # be necessary to comment out the core_test and re-run cmake) add_executable(core_test "${main_file}" "${moc_file}") |