CMake: Regenerate projects after mergewip/cmake

Plus additional adjustments.

Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

8 files changed, 26 insertions, 38 deletions

diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt
index 28b3f96a6..2c2f2b712 100644
--- a/src/linguist/CMakeLists.txt
+++ b/src/linguist/CMakeLists.txt
@@ -6,11 +6,11 @@ add_subdirectory(lrelease)
 add_subdirectory(lrelease-pro)
 add_subdirectory(lupdate)
 add_subdirectory(lupdate-pro)
-# special case begin TODO
-#if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-#    add_subdirectory(linguist)
-#endif()
-# special case end
+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
+    add_subdirectory(linguist)
+endif()
 
+# special case begin
 # Create a fake module that would emulate the Qt5::LinguistTools CMake Config package
-add_qt_module(Linguist NO_MODULE_HEADERS HEADER_MODULE) # special case
+add_qt_module(Linguist NO_MODULE_HEADERS HEADER_MODULE)
+# special case end
diff --git a/src/linguist/lconvert/.prev_CMakeLists.txt b/src/linguist/lconvert/.prev_CMakeLists.txt
index 6a47b65fb..e65bc854d 100644
--- a/src/linguist/lconvert/.prev_CMakeLists.txt
+++ b/src/linguist/lconvert/.prev_CMakeLists.txt
@@ -14,16 +14,15 @@ qt_add_tool(lconvert
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         main.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Xml
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>:
diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt
index 1b873965f..a5dee94d6 100644
--- a/src/linguist/lconvert/CMakeLists.txt
+++ b/src/linguist/lconvert/CMakeLists.txt
@@ -15,16 +15,15 @@ qt_add_tool(lconvert
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         main.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Xml
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>:
diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt
index 8d6d42700..4e32082c3 100644
--- a/src/linguist/linguist/CMakeLists.txt
+++ b/src/linguist/linguist/CMakeLists.txt
@@ -16,6 +16,7 @@ qt_add_executable(linguist
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         batchtranslation.ui
         batchtranslationdialog.cpp batchtranslationdialog.h
         errorsview.cpp errorsview.h
@@ -46,16 +47,13 @@ qt_add_executable(linguist
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::UiToolsPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::PrintSupport
-        Qt::UiTools
+        Qt::UiToolsPrivate
         Qt::Widgets
-        Qt::Xml
     ENABLE_AUTOGEN_TOOLS
         uic
 )
diff --git a/src/linguist/lrelease/.prev_CMakeLists.txt b/src/linguist/lrelease/.prev_CMakeLists.txt
index 307cef82d..b0f636edc 100644
--- a/src/linguist/lrelease/.prev_CMakeLists.txt
+++ b/src/linguist/lrelease/.prev_CMakeLists.txt
@@ -16,16 +16,15 @@ qt_add_tool(lrelease
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         main.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Xml
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>:
diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt
index 009f47d3c..22e1dee2e 100644
--- a/src/linguist/lrelease/CMakeLists.txt
+++ b/src/linguist/lrelease/CMakeLists.txt
@@ -17,16 +17,15 @@ qt_add_tool(lrelease
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         main.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Xml
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>:
diff --git a/src/linguist/lupdate/.prev_CMakeLists.txt b/src/linguist/lupdate/.prev_CMakeLists.txt
index f14ce2f77..a1535eff0 100644
--- a/src/linguist/lupdate/.prev_CMakeLists.txt
+++ b/src/linguist/lupdate/.prev_CMakeLists.txt
@@ -18,6 +18,7 @@ qt_add_tool(lupdate
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         cpp.cpp cpp.h
         java.cpp
         lupdate.h
@@ -29,12 +30,9 @@ qt_add_tool(lupdate
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::ToolsPrivate
-    PUBLIC_LIBRARIES
-        Qt::Tools
-        Qt::Xml
 )
 
 #### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>:
@@ -50,10 +48,8 @@ qt_add_tool(lupdate
 qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
     SOURCES
         qdeclarative.cpp
-    LIBRARIES
-        Qt::QmlDevToolsPrivate
     PUBLIC_LIBRARIES
-        Qt::QmlDevTools
+        Qt::QmlDevToolsPrivate
 )
 
 qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
@@ -65,6 +61,7 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
     SOURCES
         clangtoolastreader.cpp clangtoolastreader.h
         cpp_clang.cpp cpp_clang.h
+        lupdatepreprocessoraction.cpp lupdatepreprocessoraction.h
     DEFINES
         (CLANG_RESOURCE_DIR=\"/clang//include\")
         (LUPDATE_CLANG_VERSION_STR=\"\")
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt
index 4f1fc7375..d9c6ffa79 100644
--- a/src/linguist/lupdate/CMakeLists.txt
+++ b/src/linguist/lupdate/CMakeLists.txt
@@ -19,6 +19,7 @@ qt_add_tool(lupdate
         ../shared/translatormessage.cpp ../shared/translatormessage.h
         ../shared/ts.cpp
         ../shared/xliff.cpp
+        ../shared/xmlparser.cpp ../shared/xmlparser.h
         cpp.cpp cpp.h
         java.cpp
         lupdate.h
@@ -30,12 +31,9 @@ qt_add_tool(lupdate
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::ToolsPrivate
-    PUBLIC_LIBRARIES
-        Qt::Tools
-        Qt::Xml
 )
 
 #### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>:
@@ -51,10 +49,8 @@ qt_add_tool(lupdate
 qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
     SOURCES
         qdeclarative.cpp
-    LIBRARIES
-        Qt::QmlDevToolsPrivate
     PUBLIC_LIBRARIES
-        Qt::QmlDevTools
+        Qt::QmlDevToolsPrivate
 )
 
 qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
@@ -66,6 +62,7 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
     SOURCES
         clangtoolastreader.cpp clangtoolastreader.h
         cpp_clang.cpp cpp_clang.h
+        lupdatepreprocessoraction.cpp lupdatepreprocessoraction.h
     DEFINES
         # special case begin
         # remove these