From d523a642dc7f8b75e7a3a945149cce2a5c4451d3 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals.cid@kdab.com>
Date: Tue, 12 Feb 2019 17:27:16 +0100
Subject: [PATCH] cmake: enable vnc platform plugin

Change-Id: I5015681aff3c9ceb5c0b72571bc8756f3ada104c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/plugins/platforms/CMakeLists.txt     |  2 +-
 src/plugins/platforms/vnc/CMakeLists.txt | 41 ++++++++++++++++++++++++
 util/cmake/helper.py                     |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/platforms/vnc/CMakeLists.txt

diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
index e37dfc23b29..68ac4023d3a 100644
--- a/src/plugins/platforms/CMakeLists.txt
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -52,7 +52,7 @@ if(QT_FEATURE_linuxfb)
 endif()
 
 if(TARGET Qt::Network AND QT_FEATURE_vnc)
-#    TODO   add_subdirectory(vnc)
+    add_subdirectory(vnc)
 endif()
 
 if(FREEBSD)
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
new file mode 100644
index 00000000000..ced972391dc
--- /dev/null
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from vnc.pro.
+
+#####################################################################
+## qvnc Plugin:
+#####################################################################
+
+add_qt_plugin(qvnc
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qvnc.cpp qvnc_p.h
+        qvncclient.cpp qvncclient.h
+        qvncintegration.cpp qvncintegration.h
+        qvncscreen.cpp qvncscreen.h
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+    # OTHER_FILES = "vnc.json"
+    # PLUGIN_CLASS_NAME = "QVncIntegrationPlugin"
+    # _LOADED = "qt_plugin"
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate
+    LIBRARIES
+        Qt::InputSupportPrivate
+)
+#
+#extend_target(qvnc CONDITION NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN
+#    # PLUGIN_EXTENDS = "-"
+#)
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 6234d26d09c..c11632cd066 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -63,6 +63,7 @@ def map_qt_base_library(lib: str) -> str:
         'enginio_client': 'Enginio',
         'eventdispatchers': 'Qt::EventDispatcherSupport',
         'extras': 'Qt::3DExtras',
+        'fb_support': 'Qt::FbSupport',
         'fbconvenience': 'Qt::FbSupport',
         'fontdatabase_support': 'Qt::FontDatabaseSupport',
         'gamepad': 'Qt::Gamepad',
@@ -73,6 +74,7 @@ def map_qt_base_library(lib: str) -> str:
         'help': 'Qt::Help',
         'hunspellinputmethod': 'Qt::HunspellInputMethod',
         'input': 'Qt::InputSupport',
+        'input_support': 'Qt::InputSupport',
         'installer-lib': 'Qt::AppManInstaller',
         'kmsconvenience': 'Qt::KmsSupport',
         'launcher-lib': 'Qt::AppManLauncher',