diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-12-29 02:09:39 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-25 17:27:44 +0100 |
| commit | 63569a68d2fd5ca90c4660e632fba2f3f3b37d73 (patch) | |
| tree | 135a8c850a6c8067a6c7a47de2c08579d8d168b4 /tests/auto/cmake | |
| parent | e3ac2b6392bfd1449f94393804fe7f4b4207b5a7 (diff) | |
Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtCore -> Qt Core
QtDBus -> Qt D-Bus
QtDesigner -> Qt Designer
QtGui -> Qt GUI
QtImageFormats -> Qt Image Formats
QtNetwork -> Qt Network
QtPrintSupport -> Qt Print Support
QtScript -> Qt Script
QtSql -> Qt SQL
QtSvg -> Qt SVG
QtTest -> Qt Test
QtWebKit -> Qt WebKit
QtWidgets -> Qt Widgets
QtXml -> Qt XML
QtConcurrent -> Qt Concurrent (partial)
QtQuick -> Qt Quick (partial)
Also, distinguish between "module" and "library"
Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
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 46dcdcca2b..6da0c9bfa6 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -62,7 +62,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}") |