Regenerate platforms plugins part 1

Change-Id: I6093874220e7be6b92b0049d57e029e8dff62615
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

6 files changed, 168 insertions, 100 deletions

diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5797b07233
--- /dev/null
+++ b/src/plugins/platforms/.prev_CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from platforms.pro.
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    add_subdirectory(android)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(minimal)
+endif()
+if(QT_FEATURE_freetype AND NOT ANDROID)
+    add_subdirectory(offscreen)
+endif()
+if(QT_FEATURE_xcb)
+    add_subdirectory(xcb)
+endif()
+if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+    add_subdirectory(ios)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(cocoa)
+endif()
+if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT)
+    add_subdirectory(windows)
+endif()
+if(QT_FEATURE_direct3d11 AND WINRT)
+    add_subdirectory(winrt)
+endif()
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
+    add_subdirectory(direct2d)
+endif()
+if(QNX)
+    add_subdirectory(qnx)
+endif()
+if(QT_FEATURE_eglfs)
+    add_subdirectory(eglfs)
+    add_subdirectory(minimalegl)
+endif()
+if(QT_FEATURE_directfb)
+    add_subdirectory(directfb)
+endif()
+if(QT_FEATURE_linuxfb)
+    add_subdirectory(linuxfb)
+endif()
+if(QT_FEATURE_vnc AND TARGET Qt::Network)
+    add_subdirectory(vnc)
+endif()
+if(FREEBSD)
+    add_subdirectory(bsdfb)
+endif()
+if(HAIKU)
+    add_subdirectory(haiku)
+endif()
+if(WASM)
+    add_subdirectory(wasm)
+endif()
+if(QT_FEATURE_integrityfb)
+    add_subdirectory(integrity)
+endif()
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
index 7f375efb96..aba67bd59b 100644
--- a/src/plugins/platforms/CMakeLists.txt
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -1,72 +1,57 @@
-if(ANDROID) # AND NOT android-embedded
+# Generated from platforms.pro.
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
     add_subdirectory(android)
 endif()
-
 if(NOT ANDROID)
     add_subdirectory(minimal)
 endif()
-
-if (NOT ANDROID AND QT_FEATURE_freetype)
+if(QT_FEATURE_freetype AND NOT ANDROID)
     add_subdirectory(offscreen)
 endif()
-
 if(QT_FEATURE_xcb)
     add_subdirectory(xcb)
 endif()
-
-if(APPLE_UIKIT AND NOT watchOS)
-#    TODO   add_subdirectory(ios)
+if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+    # add_subdirectory(ios) special case TODO
 endif()
-
 if(APPLE_OSX)
     add_subdirectory(cocoa)
 endif()
-
-if(WIN32 AND NOT WINRT)
+if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test
     add_subdirectory(windows)
 endif()
-
-if(WINRT)
-#    TODO   add_subdirectory(winrt)
+if(QT_FEATURE_direct3d11 AND WINRT)
+    # add_subdirectory(winrt) # special case TODO
 endif()
-
-if(QT_FEATURE_direct2d)
-#    TODO   add_subdirectory(direct2d)
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
+    # add_subdirectory(direct2d) # special case TODO
 endif()
-
 if(QNX)
-#    TODO   add_subdirectory(qnx)
+    # add_subdirectory(qnx) # special case TODO
 endif()
-
 if(QT_FEATURE_eglfs)
     add_subdirectory(eglfs)
     add_subdirectory(minimalegl)
 endif()
-
 if(QT_FEATURE_directfb)
     add_subdirectory(directfb)
 endif()
-
 if(QT_FEATURE_linuxfb)
     add_subdirectory(linuxfb)
 endif()
-
-if(TARGET Qt::Network AND QT_FEATURE_vnc)
+if(QT_FEATURE_vnc AND TARGET Qt::Network)
     add_subdirectory(vnc)
 endif()
-
 if(FREEBSD)
-#    TODO   add_subdirectory(bsdfb)
+    # add_subdirectory(bsdfb) # special case TODO
 endif()
-
 if(HAIKU)
-#    TODO   add_subdirectory(haiku)
+    # add_subdirectory(haiku) # special case TODO
+endif()
+if(WASM)
+    # add_subdirectory(wasm) # special case TODO
 endif()
-
-#if(WASM)
-#    TODO   add_subdirectory(wasm)
-#endif()
-
 if(QT_FEATURE_integrityfb)
-#    TODO   add_subdirectory(integrityfb)
+    # add_subdirectory(integrity) # special case TODO
 endif()
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index b8ab5af395..9e79fc3a5c 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -88,8 +88,6 @@ add_qt_resource(qcocoa "qcocoaresources"
 
 #### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>:
 # OTHER_FILES = "cocoa.json"
-# PLUGIN_CLASS_NAME = "QCocoaIntegrationPlugin"
-# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 6bf0976224..c756db6b5a 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -92,8 +92,6 @@ add_qt_resource(qcocoa "qcocoaresources"
 
 #### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>:
 # OTHER_FILES = "cocoa.json"
-# PLUGIN_CLASS_NAME = "QCocoaIntegrationPlugin"
-# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index 315b3cf7b3..c5ea83e470 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -69,15 +69,22 @@ add_qt_plugin(qwindows
 
 # Resources:
 set_source_files_properties("openglblacklists/default.json"
-    PROPERTIES alias "default.json")
-add_qt_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES
-    openglblacklists/default.json)
+    PROPERTIES QT_RESOURCE_ALIAS "default.json"
+)
+set(openglblacklists_resource_files
+    "openglblacklists/default.json"
+)
+
+add_qt_resource(qwindows "openglblacklists"
+    PREFIX
+        "/qt-project.org/windows/openglblacklists"
+    FILES
+        ${openglblacklists_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
 # OTHER_FILES = "windows.json"
-# PLUGIN_CLASS_NAME = "QWindowsIntegrationPlugin"
-# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
@@ -170,7 +177,7 @@ extend_target(qwindows CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
-        ${PROJECT_SOURCE_DIR}/src/3rdparty/wintab
+        ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
 extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
@@ -179,31 +186,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
 )
 
 # Resources:
-add_qt_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES
-    images/closedhandcursor_32.png
-    images/closedhandcursor_48.png
-    images/closedhandcursor_64.png
-    images/dragcopycursor_32.png
-    images/dragcopycursor_48.png
-    images/dragcopycursor_64.png
-    images/draglinkcursor_32.png
-    images/draglinkcursor_48.png
-    images/draglinkcursor_64.png
-    images/dragmovecursor_32.png
-    images/dragmovecursor_48.png
-    images/dragmovecursor_64.png
-    images/openhandcursor_32.png
-    images/openhandcursor_48.png
-    images/openhandcursor_64.png
-    images/splithcursor_32.png
-    images/splithcursor_48.png
-    images/splithcursor_64.png
-    images/splitvcursor_32.png
-    images/splitvcursor_48.png
-    images/splitvcursor_64.png)
-
-
-extend_target(qwindows CONDITION (QT_FEATURE_accessibility) AND (TARGET Qt::WindowsUIAutomationSupportPrivate)
+set(cursors_resource_files
+    "images/closedhandcursor_32.png"
+    "images/closedhandcursor_48.png"
+    "images/closedhandcursor_64.png"
+    "images/dragcopycursor_32.png"
+    "images/dragcopycursor_48.png"
+    "images/dragcopycursor_64.png"
+    "images/draglinkcursor_32.png"
+    "images/draglinkcursor_48.png"
+    "images/draglinkcursor_64.png"
+    "images/dragmovecursor_32.png"
+    "images/dragmovecursor_48.png"
+    "images/dragmovecursor_64.png"
+    "images/openhandcursor_32.png"
+    "images/openhandcursor_48.png"
+    "images/openhandcursor_64.png"
+    "images/splithcursor_32.png"
+    "images/splithcursor_48.png"
+    "images/splithcursor_64.png"
+    "images/splitvcursor_32.png"
+    "images/splitvcursor_48.png"
+    "images/splitvcursor_64.png"
+)
+
+add_qt_resource(qwindows "cursors"
+    PREFIX
+        "/qt-project.org/windows/cursors"
+    FILES
+        ${cursors_resource_files}
+)
+
+
+extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
     LIBRARIES
         Qt::WindowsUIAutomationSupportPrivate
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 3d0d37b7ed..18764124e4 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -70,15 +70,22 @@ add_qt_plugin(qwindows
 
 # Resources:
 set_source_files_properties("openglblacklists/default.json"
-    PROPERTIES QT_RESOURCE_ALIAS "default.json")
-add_qt_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES
-    openglblacklists/default.json)
+    PROPERTIES QT_RESOURCE_ALIAS "default.json"
+)
+set(openglblacklists_resource_files
+    "openglblacklists/default.json"
+)
+
+add_qt_resource(qwindows "openglblacklists"
+    PREFIX
+        "/qt-project.org/windows/openglblacklists"
+    FILES
+        ${openglblacklists_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
 # OTHER_FILES = "windows.json"
-# PLUGIN_CLASS_NAME = "QWindowsIntegrationPlugin"
-# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
@@ -171,7 +178,7 @@ extend_target(qwindows CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
-        ${PROJECT_SOURCE_DIR}/src/3rdparty/wintab
+        ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
 extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
@@ -180,31 +187,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
 )
 
 # Resources:
-add_qt_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES
-    images/closedhandcursor_32.png
-    images/closedhandcursor_48.png
-    images/closedhandcursor_64.png
-    images/dragcopycursor_32.png
-    images/dragcopycursor_48.png
-    images/dragcopycursor_64.png
-    images/draglinkcursor_32.png
-    images/draglinkcursor_48.png
-    images/draglinkcursor_64.png
-    images/dragmovecursor_32.png
-    images/dragmovecursor_48.png
-    images/dragmovecursor_64.png
-    images/openhandcursor_32.png
-    images/openhandcursor_48.png
-    images/openhandcursor_64.png
-    images/splithcursor_32.png
-    images/splithcursor_48.png
-    images/splithcursor_64.png
-    images/splitvcursor_32.png
-    images/splitvcursor_48.png
-    images/splitvcursor_64.png)
-
-
-extend_target(qwindows CONDITION (QT_FEATURE_accessibility) AND (TARGET Qt::WindowsUIAutomationSupportPrivate)
+set(cursors_resource_files
+    "images/closedhandcursor_32.png"
+    "images/closedhandcursor_48.png"
+    "images/closedhandcursor_64.png"
+    "images/dragcopycursor_32.png"
+    "images/dragcopycursor_48.png"
+    "images/dragcopycursor_64.png"
+    "images/draglinkcursor_32.png"
+    "images/draglinkcursor_48.png"
+    "images/draglinkcursor_64.png"
+    "images/dragmovecursor_32.png"
+    "images/dragmovecursor_48.png"
+    "images/dragmovecursor_64.png"
+    "images/openhandcursor_32.png"
+    "images/openhandcursor_48.png"
+    "images/openhandcursor_64.png"
+    "images/splithcursor_32.png"
+    "images/splithcursor_48.png"
+    "images/splithcursor_64.png"
+    "images/splitvcursor_32.png"
+    "images/splitvcursor_48.png"
+    "images/splitvcursor_64.png"
+)
+
+add_qt_resource(qwindows "cursors"
+    PREFIX
+        "/qt-project.org/windows/cursors"
+    FILES
+        ${cursors_resource_files}
+)
+
+
+extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
     LIBRARIES
         Qt::WindowsUIAutomationSupportPrivate
     PUBLIC_LIBRARIES