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

Conflicts:
	dependencies.yaml

Change-Id: I01be97466ce583c1852c00986d1e925dda80038c

10 files changed, 376 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..ec6dd2b
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from src.pro.
+
+add_subdirectory(repparser)
+if(QT_FEATURE_localserver)
+    add_subdirectory(remoteobjects)
+endif()
+if(TARGET Qt::Quick)
+    add_subdirectory(imports)
+endif()
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
new file mode 100644
index 0000000..1f43c85
--- /dev/null
+++ b/src/imports/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from imports.pro.
+
+add_subdirectory(compat)
+add_subdirectory(remoteobjects)
diff --git a/src/imports/compat/CMakeLists.txt b/src/imports/compat/CMakeLists.txt
new file mode 100644
index 0000000..f275bf7
--- /dev/null
+++ b/src/imports/compat/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from compat.pro.
+
+#####################################################################
+## qtqmlremoteobjects Plugin:
+#####################################################################
+
+qt_add_qml_module(qtqmlremoteobjects
+    URI "QtQml.RemoteObjects"
+    VERSION "1.0"
+    CLASSNAME QtQmlRemoteObjectsPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::RemoteObjects
+)
+
+#### Keys ignored in scope 1:.:.:compat.pro:<TRUE>:
+# CXX_MODULE = "qml"
+# IMPORT_VERSION = "1.0"
+# TARGETPATH = "QtQml/RemoteObjects"
diff --git a/src/imports/remoteobjects/.prev_CMakeLists.txt b/src/imports/remoteobjects/.prev_CMakeLists.txt
new file mode 100644
index 0000000..e7baf77
--- /dev/null
+++ b/src/imports/remoteobjects/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from remoteobjects.pro.
+
+#####################################################################
+## qtremoteobjects Plugin:
+#####################################################################
+
+qt_add_qml_module(qtremoteobjects
+    URI "QtRemoteObjects"
+    VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtRemoteObjectsPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    LIBRARIES
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::RemoteObjects
+)
+
+#### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>:
+# CXX_MODULE = "qml"
+# IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
+# TARGETPATH = "QtRemoteObjects"
diff --git a/src/imports/remoteobjects/CMakeLists.txt b/src/imports/remoteobjects/CMakeLists.txt
new file mode 100644
index 0000000..2c84b0c
--- /dev/null
+++ b/src/imports/remoteobjects/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from remoteobjects.pro.
+
+#####################################################################
+## qtremoteobjects Plugin:
+#####################################################################
+
+qt_add_qml_module(qtremoteobjects
+    URI "QtRemoteObjects"
+    VERSION "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}" # special case
+    CLASSNAME QtRemoteObjectsPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    LIBRARIES
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::RemoteObjects
+)
+
+#### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>:
+# CXX_MODULE = "qml"
+# IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
+# TARGETPATH = "QtRemoteObjects"
diff --git a/src/remoteobjects/.prev_CMakeLists.txt b/src/remoteobjects/.prev_CMakeLists.txt
new file mode 100644
index 0000000..88af4e0
--- /dev/null
+++ b/src/remoteobjects/.prev_CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from remoteobjects.pro.
+
+#####################################################################
+## RemoteObjects Module:
+#####################################################################
+
+qt_add_module(RemoteObjects
+    QMAKE_MODULE_CONFIG remoteobjects_repc
+    SOURCES
+        qconnection_local_backend.cpp qconnection_local_backend_p.h
+        qconnection_tcpip_backend.cpp qconnection_tcpip_backend_p.h
+        qconnectionfactories.cpp qconnectionfactories_p.h
+        qremoteobjectabstractitemmodeladapter.cpp qremoteobjectabstractitemmodeladapter_p.h
+        qremoteobjectabstractitemmodelreplica.cpp qremoteobjectabstractitemmodelreplica.h qremoteobjectabstractitemmodelreplica_p.h
+        qremoteobjectabstractitemmodeltypes.h
+        qremoteobjectdynamicreplica.cpp qremoteobjectdynamicreplica.h
+        qremoteobjectnode.cpp qremoteobjectnode.h qremoteobjectnode_p.h
+        qremoteobjectpacket.cpp qremoteobjectpacket_p.h
+        qremoteobjectpendingcall.cpp qremoteobjectpendingcall.h qremoteobjectpendingcall_p.h
+        qremoteobjectregistry.cpp qremoteobjectregistry.h
+        qremoteobjectregistrysource.cpp qremoteobjectregistrysource_p.h
+        qremoteobjectreplica.cpp qremoteobjectreplica.h qremoteobjectreplica_p.h
+        qremoteobjectsettingsstore.cpp qremoteobjectsettingsstore.h
+        qremoteobjectsource.cpp qremoteobjectsource.h qremoteobjectsource_p.h
+        qremoteobjectsourceio.cpp qremoteobjectsourceio_p.h
+        qtremoteobjectglobal.cpp qtremoteobjectglobal.h
+    DEFINES
+        QT_BUILD_REMOTEOBJECTS_LIB
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+        QT_NO_URL_CAST_FROM_STRING
+    INCLUDE_DIRECTORIES
+        .
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>:
+# MODULE = "remoteobjects"
+# MODULE_CONFIG = "remoteobjects_repc"
+# OTHER_FILES = "doc/qtremoteobjects.qdocconf" "doc/src/remoteobjects-cpp.qdoc" "doc/src/remoteobjects-index.qdoc" "doc/src/remoteobjects-overview.qdoc" "doc/src/remoteobjects-repc.qdoc"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(RemoteObjects CONDITION QNX
+    SOURCES
+        qconnection_qnx_backend.cpp qconnection_qnx_backend_p.h
+        qconnection_qnx_global_p.h
+        qconnection_qnx_qiodevices.cpp qconnection_qnx_qiodevices.h qconnection_qnx_qiodevices_p.h
+        qconnection_qnx_server.cpp qconnection_qnx_server.h qconnection_qnx_server_p.h
+)
+
+qt_extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
+    PUBLIC_LIBRARIES
+        ham
+)
+qt_add_docs(RemoteObjects
+    doc/qtremoteobjects.qdocconf
+)
+
diff --git a/src/remoteobjects/CMakeLists.txt b/src/remoteobjects/CMakeLists.txt
new file mode 100644
index 0000000..94c5bed
--- /dev/null
+++ b/src/remoteobjects/CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from remoteobjects.pro.
+
+#####################################################################
+## RemoteObjects Module:
+#####################################################################
+
+qt_add_module(RemoteObjects
+    QMAKE_MODULE_CONFIG remoteobjects_repc
+    SOURCES
+        qconnection_local_backend.cpp qconnection_local_backend_p.h
+        qconnection_tcpip_backend.cpp qconnection_tcpip_backend_p.h
+        qconnectionfactories.cpp qconnectionfactories_p.h
+        qremoteobjectabstractitemmodeladapter.cpp qremoteobjectabstractitemmodeladapter_p.h
+        qremoteobjectabstractitemmodelreplica.cpp qremoteobjectabstractitemmodelreplica.h qremoteobjectabstractitemmodelreplica_p.h
+        qremoteobjectabstractitemmodeltypes.h
+        qremoteobjectdynamicreplica.cpp qremoteobjectdynamicreplica.h
+        qremoteobjectnode.cpp qremoteobjectnode.h qremoteobjectnode_p.h
+        qremoteobjectpacket.cpp qremoteobjectpacket_p.h
+        qremoteobjectpendingcall.cpp qremoteobjectpendingcall.h qremoteobjectpendingcall_p.h
+        qremoteobjectregistry.cpp qremoteobjectregistry.h
+        qremoteobjectregistrysource.cpp qremoteobjectregistrysource_p.h
+        qremoteobjectreplica.cpp qremoteobjectreplica.h qremoteobjectreplica_p.h
+        qremoteobjectsettingsstore.cpp qremoteobjectsettingsstore.h
+        qremoteobjectsource.cpp qremoteobjectsource.h qremoteobjectsource_p.h
+        qremoteobjectsourceio.cpp qremoteobjectsourceio_p.h
+        qtremoteobjectglobal.cpp qtremoteobjectglobal.h
+    DEFINES
+        QT_BUILD_REMOTEOBJECTS_LIB
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+        QT_NO_URL_CAST_FROM_STRING
+    INCLUDE_DIRECTORIES
+        .
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>:
+# MODULE = "remoteobjects"
+# MODULE_CONFIG = "remoteobjects_repc"
+# OTHER_FILES = "doc/qtremoteobjects.qdocconf" "doc/src/remoteobjects-cpp.qdoc" "doc/src/remoteobjects-index.qdoc" "doc/src/remoteobjects-overview.qdoc" "doc/src/remoteobjects-repc.qdoc"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(RemoteObjects CONDITION QNX
+    SOURCES
+        qconnection_qnx_backend.cpp qconnection_qnx_backend_p.h
+        qconnection_qnx_global_p.h
+        qconnection_qnx_qiodevices.cpp qconnection_qnx_qiodevices.h qconnection_qnx_qiodevices_p.h
+        qconnection_qnx_server.cpp qconnection_qnx_server.h qconnection_qnx_server_p.h
+)
+
+qt_extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
+    PUBLIC_LIBRARIES
+        ham
+)
+qt_add_docs(RemoteObjects
+    doc/qtremoteobjects.qdocconf
+)
+
+include(Qt6RemoteObjectsMacros.cmake)    # special case
diff --git a/src/remoteobjects/Qt6RemoteObjectsMacros.cmake b/src/remoteobjects/Qt6RemoteObjectsMacros.cmake
new file mode 100644
index 0000000..61373ed
--- /dev/null
+++ b/src/remoteobjects/Qt6RemoteObjectsMacros.cmake
@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2019 The Qt Company Ltd.
+# Contact: https://www.qt.io/licensing/
+#
+# This file is part of the QtRepc module of the Qt Toolkit.
+#
+# $QT_BEGIN_LICENSE:LGPL$
+# Commercial License Usage
+# Licensees holding valid commercial Qt licenses may use this file in
+# accordance with the commercial license agreement provided with the
+# Software or, alternatively, in accordance with the terms contained in
+# a written agreement between you and The Qt Company. For licensing terms
+# and conditions see https://www.qt.io/terms-conditions. For further
+# information use the contact form at https://www.qt.io/contact-us.
+#
+# GNU Lesser General Public License Usage
+# Alternatively, this file may be used under the terms of the GNU Lesser
+# General Public License version 3 as published by the Free Software
+# Foundation and appearing in the file LICENSE.LGPL3 included in the
+# packaging of this file. Please review the following information to
+# ensure the GNU Lesser General Public License version 3 requirements
+# will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+#
+# GNU General Public License Usage
+# Alternatively, this file may be used under the terms of the GNU
+# General Public License version 2.0 or (at your option) the GNU General
+# Public license version 3 or any later version approved by the KDE Free
+# Qt Foundation. The licenses are as published by the Free Software
+# Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+# included in the packaging of this file. Please review the following
+# information to ensure the GNU General Public License requirements will
+# be met: https://www.gnu.org/licenses/gpl-2.0.html and
+# https://www.gnu.org/licenses/gpl-3.0.html.
+#
+# $QT_END_LICENSE$
+
+function(qt6_add_repc_files type target)
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs FILES)
+
+    cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(outfiles)
+    set(repc_incpath) ########### TODO
+
+    foreach(it ${ARGS_FILES})
+        get_filename_component(outfilename ${it} NAME_WE)
+        get_filename_component(infile ${it} ABSOLUTE)
+        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/rep_${outfilename}_${type}.h)
+        add_custom_command(OUTPUT ${outfile}
+                           ${QT_TOOL_PATH_SETUP_COMMAND}
+                           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::repc
+                           ARGS -o ${type} ${repc_incpath} ${infile} ${outfile}
+                           MAIN_DEPENDENCY ${infile}
+                           VERBATIM)
+        list(APPEND outfiles ${outfile})
+    endforeach()
+    target_sources(${target} PRIVATE ${outfiles})
+endfunction()
+
+# Add .rep source files to a target to generate source header files
+function(qt6_add_repc_source target)
+    list(POP_FRONT ARGV)
+    qt6_add_repc_files(source ${target} FILES ${ARGV})
+endfunction()
+
+# Add .rep source files to a target to generate replica header files
+function(qt6_add_repc_replica target)
+    list(POP_FRONT ARGV)
+    qt6_add_repc_files(replica ${target} FILES ${ARGV})
+endfunction()
+
+# Add .rep source files to a target to generate combined (source and replica) header files
+function(qt6_add_repc_merged target)
+    list(POP_FRONT ARGV)
+    qt6_add_repc_files(merged ${target} FILES ${ARGV})
+endfunction()
diff --git a/src/repparser/.prev_CMakeLists.txt b/src/repparser/.prev_CMakeLists.txt
new file mode 100644
index 0000000..d6b8abd
--- /dev/null
+++ b/src/repparser/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from repparser.pro.
+
+#####################################################################
+## RepParser Module:
+#####################################################################
+
+qt_add_module(RepParser
+    HEADER_MODULE
+    SOURCES
+        qregexparser.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>:
+# MODULE = "repparser"
+# def_build = "debug"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:repparser.pro:QT_CONFIG___contains___release,debug OR release:
+# def_build = "release"
+
+#### Keys ignored in scope 4:.:.:repparser.pro:lib_bundle:
+# FRAMEWORK_DATA.files = "$$PWD/parser.g"
+# FRAMEWORK_DATA.path = "Headers"
+# FRAMEWORK_DATA.version = "Versions"
+# QMAKE_BUNDLE_DATA = "FRAMEWORK_DATA"
+
+#### Keys ignored in scope 5:.:.:repparser.pro:else:
+# extra_headers.files = "$$PWD/parser.g"
+# extra_headers.path = "$$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME"
+
+#### Keys ignored in scope 7:.:.:repparser.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD:
+# COPIES = "extra_headers"
+
+#### Keys ignored in scope 8:.:.:repparser.pro:else:
+# INSTALLS = "extra_headers"
diff --git a/src/repparser/CMakeLists.txt b/src/repparser/CMakeLists.txt
new file mode 100644
index 0000000..dc1a9d1
--- /dev/null
+++ b/src/repparser/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from repparser.pro.
+
+#####################################################################
+## RepParser Module:
+#####################################################################
+
+qt_add_module(RepParser
+    HEADER_MODULE
+    SOURCES
+        # qregexparser.h          # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>:
+# MODULE = "repparser"
+# def_build = "debug"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:repparser.pro:QT_CONFIG___contains___release,debug OR release:
+# def_build = "release"
+
+#### Keys ignored in scope 4:.:.:repparser.pro:lib_bundle:
+# FRAMEWORK_DATA.files = "$$PWD/parser.g"
+# FRAMEWORK_DATA.path = "Headers"
+# FRAMEWORK_DATA.version = "Versions"
+# QMAKE_BUNDLE_DATA = "FRAMEWORK_DATA"
+
+#### Keys ignored in scope 5:.:.:repparser.pro:else:
+# extra_headers.files = "$$PWD/parser.g"
+# extra_headers.path = "$$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME"
+
+#### Keys ignored in scope 7:.:.:repparser.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD:
+# COPIES = "extra_headers"
+
+#### Keys ignored in scope 8:.:.:repparser.pro:else:
+# INSTALLS = "extra_headers"