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

 Conflicts:
	dependencies.yaml
        coin/module_config.yaml

Change-Id: Ibdaaddae3887694fa72bbd8d25d78d586c4ab803

9 files changed, 128 insertions, 0 deletions

diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
new file mode 100644
index 0000000..2214137
--- /dev/null
+++ b/tests/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+endif()
+qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..ce4dc49
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+endif()
+
+qt_build_tests()
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..ccb6649
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from auto.pro.
+
+add_subdirectory(cmake)
+add_subdirectory(oauth1)
+add_subdirectory(oauth2)
+add_subdirectory(oauth1signature)
+add_subdirectory(oauthhttpserverreplyhandler)
+if(QT_FEATURE_private_tests)
+    add_subdirectory(abstractoauth)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
new file mode 100644
index 0000000..dd1f872
--- /dev/null
+++ b/tests/auto/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from auto.pro.
+
+# add_subdirectory(cmake) special case remove
+add_subdirectory(oauth1)
+add_subdirectory(oauth2)
+add_subdirectory(oauth1signature)
+add_subdirectory(oauthhttpserverreplyhandler)
+if(QT_FEATURE_private_tests)
+    add_subdirectory(abstractoauth)
+endif()
diff --git a/tests/auto/abstractoauth/CMakeLists.txt b/tests/auto/abstractoauth/CMakeLists.txt
new file mode 100644
index 0000000..a8e6404
--- /dev/null
+++ b/tests/auto/abstractoauth/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from abstractoauth.pro.
+
+#####################################################################
+## tst_abstractoauth Test:
+#####################################################################
+
+qt_add_test(tst_abstractoauth
+    SOURCES
+        tst_abstractoauth.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkAuth
+        Qt::NetworkAuthPrivate
+)
+
+#### Keys ignored in scope 1:.:.:abstractoauth.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/oauth1/CMakeLists.txt b/tests/auto/oauth1/CMakeLists.txt
new file mode 100644
index 0000000..24fb617
--- /dev/null
+++ b/tests/auto/oauth1/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from oauth1.pro.
+
+#####################################################################
+## tst_oauth1 Test:
+#####################################################################
+
+qt_add_test(tst_oauth1
+    SOURCES
+        ../shared/webserver.h
+        tst_oauth1.cpp
+    INCLUDE_DIRECTORIES
+        ../shared
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkAuth
+        Qt::NetworkAuthPrivate
+)
+
+#### Keys ignored in scope 1:.:.:oauth1.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/oauth1signature/CMakeLists.txt b/tests/auto/oauth1signature/CMakeLists.txt
new file mode 100644
index 0000000..e71ec9b
--- /dev/null
+++ b/tests/auto/oauth1signature/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from oauth1signature.pro.
+
+#####################################################################
+## tst_oauth1signature Test:
+#####################################################################
+
+qt_add_test(tst_oauth1signature
+    SOURCES
+        tst_oauth1signature.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkAuth
+)
+
+#### Keys ignored in scope 1:.:.:oauth1signature.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/oauth2/CMakeLists.txt b/tests/auto/oauth2/CMakeLists.txt
new file mode 100644
index 0000000..e9426d4
--- /dev/null
+++ b/tests/auto/oauth2/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from oauth2.pro.
+
+#####################################################################
+## tst_oauth2 Test:
+#####################################################################
+
+qt_add_test(tst_oauth2
+    SOURCES
+        ../shared/webserver.h
+        tst_oauth2.cpp
+    INCLUDE_DIRECTORIES
+        ../shared
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkAuth
+        Qt::NetworkAuthPrivate
+)
+
+#### Keys ignored in scope 1:.:.:oauth2.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt
new file mode 100644
index 0000000..6ce86d3
--- /dev/null
+++ b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from oauthhttpserverreplyhandler.pro.
+
+#####################################################################
+## tst_oauthhttpserverreplyhandler Test:
+#####################################################################
+
+qt_add_test(tst_oauthhttpserverreplyhandler
+    SOURCES
+        tst_oauthhttpserverreplyhandler.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkAuth
+)
+
+#### Keys ignored in scope 1:.:.:oauthhttpserverreplyhandler.pro:<TRUE>:
+# TEMPLATE = "app"