Merge remote-tracking branch 'origin/wip/cmake' into dev

This pulls the CMake port, which not only adds CMake files but also
modifies existing code. A brief summary of "seemingly unrelated" changes:

    * configure.json was re-formatted to not use multi-line strings. That
      is an extension of the Qt JSON parser but not JSON compliant, which
      is needed for the configure.json-to-cmake conversion script (python).
    * Some moc inclusions were added due to CMake's slightly different way
      of handling moc. With the changes the files build with qmake and cmake.
    * Since CMake just grep's for the Q_OBJECT macro to determine whether to
      call moc (instead of doing pre-processing like qmake), the existing use
      of "Q_OBJECT" in our documentation was changed to \Q_OBJECT, which cmake
      doesn't see and which is now a qdoc macro.
    * QTestLib's qFindTestData was extended to also search in the source
      directory known at build time.

What this change also brings is a new way of building modules in Coin by using
YAML configuration files that describe the steps of building and testing in Coin
specific terms. The platform configuration files in qt5 are instructed to use the
old Coin built-in way of testing ("UseLegacyInstructions" feature) but for any
configurations that do not have this, these yaml files in the coin/ sub-directory
are used and shared across repositories.

Change-Id: I1d832c3400e8d6945ad787024ba60e7440225c08

1 files changed, 177 insertions, 0 deletions

diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c504bbc64d
--- /dev/null
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -0,0 +1,177 @@
+# Generated from xcb.pro.
+
+#####################################################################
+## XcbQpa Module:
+#####################################################################
+
+qt_add_module(XcbQpa
+    INTERNAL_MODULE
+    NO_MODULE_HEADERS
+    SOURCES
+        gl_integrations/qxcbglintegration.cpp gl_integrations/qxcbglintegration.h
+        gl_integrations/qxcbglintegrationfactory.cpp gl_integrations/qxcbglintegrationfactory.h
+        gl_integrations/qxcbglintegrationplugin.h
+        gl_integrations/qxcbnativeinterfacehandler.cpp gl_integrations/qxcbnativeinterfacehandler.h
+        qxcbatom.cpp qxcbatom.h
+        qxcbbackingstore.cpp qxcbbackingstore.h
+        qxcbclipboard.cpp qxcbclipboard.h
+        qxcbconnection.cpp qxcbconnection.h
+        qxcbconnection_basic.cpp qxcbconnection_basic.h
+        qxcbconnection_screens.cpp
+        qxcbconnection_xi2.cpp
+        qxcbcursor.cpp qxcbcursor.h
+        qxcbeventdispatcher.cpp qxcbeventdispatcher.h
+        qxcbeventqueue.cpp qxcbeventqueue.h
+        qxcbimage.cpp qxcbimage.h
+        qxcbintegration.cpp qxcbintegration.h
+        qxcbkeyboard.cpp qxcbkeyboard.h
+        qxcbmime.cpp qxcbmime.h
+        qxcbnativeinterface.cpp qxcbnativeinterface.h
+        qxcbobject.h
+        qxcbscreen.cpp qxcbscreen.h
+        qxcbsystemtraytracker.cpp qxcbsystemtraytracker.h
+        qxcbwindow.cpp qxcbwindow.h
+        qxcbwmsupport.cpp qxcbwmsupport.h
+        qxcbxsettings.cpp qxcbxsettings.h
+    DEFINES
+        QT_BUILD_XCB_PLUGIN
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        gl_integrations
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        Qt::XkbCommonSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EdidSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
+        Qt::ServiceSupport
+        Qt::ThemeSupport
+        Qt::XkbCommonSupport
+        XCB::ICCCM
+        XCB::IMAGE
+        XCB::KEYSYMS
+        XCB::RANDR
+        XCB::RENDER
+        XCB::RENDERUTIL
+        XCB::SHAPE
+        XCB::SHM
+        XCB::SYNC
+        XCB::XCB
+        XCB::XFIXES
+        XCB::XINERAMA
+        XCB::XINPUT
+        XCB::XKB
+        XKB::XKB
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
+    LIBRARIES
+        Qt::LinuxAccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::LinuxAccessibilitySupport
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+    LIBRARIES
+        Qt::VulkanSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupport
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        qxcbdrag.cpp qxcbdrag.h
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+    PUBLIC_LIBRARIES
+        X11::XCB
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+    SOURCES
+        qxcbsessionmanager.cpp qxcbsessionmanager.h
+    PUBLIC_LIBRARIES
+        ${X11_SM_LIB} ${X11_ICE_LIB}
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+    COMPILE_OPTIONS
+        -ftemplate-depth=1024
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+    SOURCES
+        nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
+        nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
+        nativepainting/qpaintengine_x11.cpp nativepainting/qpaintengine_x11_p.h
+        nativepainting/qpixmap_x11.cpp nativepainting/qpixmap_x11_p.h
+        nativepainting/qt_x11_p.h
+        nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
+        nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
+    INCLUDE_DIRECTORIES
+        nativepainting
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+    PUBLIC_LIBRARIES
+        PkgConfig::XRender
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+#####################################################################
+## qxcb Plugin:
+#####################################################################
+
+qt_add_plugin(qxcb
+    TYPE platforms
+    CLASS_NAME QXcbIntegrationPlugin
+    SOURCES
+        qxcbmain.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::XcbQpa
+)
+
+#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
+# OTHER_FILES = "xcb.json" "README"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(gl_integrations)