9 files changed, 55 insertions, 19 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
index 5eae3760b..bdf5c6b16 100644
--- a/tests/auto/.prev_CMakeLists.txt
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -1,14 +1,14 @@
 # Generated from auto.pro.
 
-if(QT_FEATURE_process AND NOT CMAKE_CROSS_COMPILING)
+if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(linguist)
     add_subdirectory(qtattributionsscanner)
     add_subdirectory(qtdiag)
 endif()
-if(NOT CMAKE_CROSS_COMPILING)
+if(NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qdoc)
 endif()
-if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING)
+if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qhelpcontentmodel)
     add_subdirectory(qhelpenginecore)
     add_subdirectory(qhelpgenerator)
@@ -17,6 +17,6 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING)
 endif()
 add_subdirectory(cmake)
 add_subdirectory(installed_cmake)
-if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSS_COMPILING AND NOT WINRT)
+if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT)
     add_subdirectory(windeployqt)
 endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 4da71b9bf..ab374e67a 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Generated from auto.pro.
 
-if(QT_FEATURE_process AND NOT CMAKE_CROSS_COMPILING)
+if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(linguist)
     add_subdirectory(qtattributionsscanner)
     add_subdirectory(qtdiag)
 endif()
-if(NOT CMAKE_CROSS_COMPILING)
+if(NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qdoc)
 endif()
-if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING)
+if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qhelpcontentmodel)
     add_subdirectory(qhelpenginecore)
     add_subdirectory(qhelpgenerator)
@@ -19,6 +19,6 @@ endif()
 #add_subdirectory(cmake)
 #add_subdirectory(installed_cmake)
 # special case end
-if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSS_COMPILING AND NOT WINRT)
+if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT)
     add_subdirectory(windeployqt)
 endif()
diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt
index e9a5da6eb..750ce80d0 100644
--- a/tests/auto/qdoc/CMakeLists.txt
+++ b/tests/auto/qdoc/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Generated from qdoc.pro.
 
+add_subdirectory(config)
 add_subdirectory(generatedoutput)
-add_subdirectory(qdoccommandlineparser)
+add_subdirectory(utilities)
diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt
new file mode 100644
index 000000000..2d54cc041
--- /dev/null
+++ b/tests/auto/qdoc/config/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from config.pro.
+
+#####################################################################
+## tst_config Test:
+#####################################################################
+
+qt_add_test(tst_config
+    SOURCES
+        ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h
+        ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h
+        ../../../../src/qdoc/loggingcategory.h
+        ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h
+        tst_config.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../src/qdoc
+)
diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt
index 1d8da3313..d64432b5f 100644
--- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt
+++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt
@@ -8,7 +8,3 @@ qt_add_test(tst_generatedOutput
     SOURCES
         tst_generatedoutput.cpp
 )
-qt_add_docs(tst_generatedOutput
-    test.qdocconf
-)
-
diff --git a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt
new file mode 100644
index 000000000..6bf74a90a
--- /dev/null
+++ b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdoccommandlineparser.pro.
+
+#####################################################################
+## tst_qdoccommandlineparser Test:
+#####################################################################
+
+qt_add_test(tst_qdoccommandlineparser
+    SOURCES
+        ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h
+        tst_qdoccommandlineparser.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../src/qdoc
+)
diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt
new file mode 100644
index 000000000..bd949b84d
--- /dev/null
+++ b/tests/auto/qdoc/utilities/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from utilities.pro.
+
+#####################################################################
+## tst_utilities Test:
+#####################################################################
+
+qt_add_test(tst_utilities
+    SOURCES
+        ../../../../src/qdoc/loggingcategory.h
+        ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
+        tst_utilities.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../src/qdoc
+)
diff --git a/tests/auto/qhelpgenerator/CMakeLists.txt b/tests/auto/qhelpgenerator/CMakeLists.txt
index 02c6f6666..40ed0bec3 100644
--- a/tests/auto/qhelpgenerator/CMakeLists.txt
+++ b/tests/auto/qhelpgenerator/CMakeLists.txt
@@ -13,10 +13,8 @@ qt_add_test(tst_qhelpgenerator
     DEFINES
         QT_USE_USING_NAMESPACE
         SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
-    LIBRARIES
-        Qt::HelpPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
-        Qt::Help
+        Qt::HelpPrivate
         Qt::Sql
 )
diff --git a/tests/auto/qhelpprojectdata/CMakeLists.txt b/tests/auto/qhelpprojectdata/CMakeLists.txt
index 6d686128a..1d140b287 100644
--- a/tests/auto/qhelpprojectdata/CMakeLists.txt
+++ b/tests/auto/qhelpprojectdata/CMakeLists.txt
@@ -12,9 +12,7 @@ qt_add_test(tst_qhelpprojectdata
     DEFINES
         QT_USE_USING_NAMESPACE
         SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
-    LIBRARIES
-        Qt::HelpPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
-        Qt::Help
+        Qt::HelpPrivate
 )