summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/CMakeLists.txt1
-rw-r--r--src/3rdparty/libarchive/CMakeLists.txt5
-rw-r--r--src/3rdparty/libbacktrace/CMakeLists.txt5
-rw-r--r--src/3rdparty/libyaml/CMakeLists.txt5
-rw-r--r--src/3rdparty/stackwalker/CMakeLists.txt6
-rw-r--r--src/application-lib/CMakeLists.txt5
-rw-r--r--src/common-lib/CMakeLists.txt5
-rw-r--r--src/crypto-lib/CMakeLists.txt5
-rw-r--r--src/dbus-lib/CMakeLists.txt10
-rw-r--r--src/intent-client-lib/CMakeLists.txt5
-rw-r--r--src/intent-server-lib/CMakeLists.txt5
-rw-r--r--src/launcher-lib/CMakeLists.txt5
-rw-r--r--src/main-lib/CMakeLists.txt5
-rw-r--r--src/manager-lib/CMakeLists.txt5
-rw-r--r--src/monitor-lib/CMakeLists.txt5
-rw-r--r--src/notification-lib/CMakeLists.txt5
-rw-r--r--src/package-lib/CMakeLists.txt5
-rw-r--r--src/plugin-interfaces/CMakeLists.txt5
-rw-r--r--src/shared-main-lib/CMakeLists.txt5
-rw-r--r--src/tools/appman/CMakeLists.txt5
-rw-r--r--src/tools/controller/CMakeLists.txt5
-rw-r--r--src/tools/dumpqmltypes/CMakeLists.txt14
-rw-r--r--src/tools/launcher-qml/CMakeLists.txt8
-rw-r--r--src/tools/packager/CMakeLists.txt5
-rw-r--r--src/tools/testrunner/CMakeLists.txt5
-rw-r--r--src/tools/uploader/CMakeLists.txt8
-rw-r--r--src/window-lib/CMakeLists.txt5
27 files changed, 1 insertions, 151 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index 23fbb887..6d0e4e17 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,3 +1,4 @@
+
if(NOT QT_FEATURE_am_system_libarchive AND QT_FEATURE_am_installer)
add_subdirectory(libarchive)
endif()
diff --git a/src/3rdparty/libarchive/CMakeLists.txt b/src/3rdparty/libarchive/CMakeLists.txt
index 46d8cd8d..72f69c83 100644
--- a/src/3rdparty/libarchive/CMakeLists.txt
+++ b/src/3rdparty/libarchive/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from libarchive.pro.
-
-#####################################################################
-## BundledArchive Generic Library:
-#####################################################################
if (APPLE)
find_package(Iconv)
diff --git a/src/3rdparty/libbacktrace/CMakeLists.txt b/src/3rdparty/libbacktrace/CMakeLists.txt
index 0561327f..ca467cf2 100644
--- a/src/3rdparty/libbacktrace/CMakeLists.txt
+++ b/src/3rdparty/libbacktrace/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from libbacktrace.pro.
-
-#####################################################################
-## BundledBacktrace Generic Library:
-#####################################################################
qt_internal_add_3rdparty_library(BundledBacktrace
QMAKE_LIB_NAME backtrace
diff --git a/src/3rdparty/libyaml/CMakeLists.txt b/src/3rdparty/libyaml/CMakeLists.txt
index 04523da4..16b669f2 100644
--- a/src/3rdparty/libyaml/CMakeLists.txt
+++ b/src/3rdparty/libyaml/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from libyaml.pro.
-
-#####################################################################
-## BundledLibYaml Generic Library:
-#####################################################################
qt_internal_add_3rdparty_library(BundledLibYaml
QMAKE_LIB_NAME yaml
diff --git a/src/3rdparty/stackwalker/CMakeLists.txt b/src/3rdparty/stackwalker/CMakeLists.txt
index ee1a5122..2f7732a3 100644
--- a/src/3rdparty/stackwalker/CMakeLists.txt
+++ b/src/3rdparty/stackwalker/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from stackwalker.pro.
-
-#####################################################################
-## BundledStackwalker Generic Library:
-#####################################################################
qt_internal_add_3rdparty_library(BundledStackwalker
QMAKE_LIB_NAME stackwalker
@@ -17,4 +12,3 @@ qt_internal_add_3rdparty_library(BundledStackwalker
)
qt_disable_warnings(BundledStackwalker)
qt_set_symbol_visibility_hidden(BundledStackwalker)
-
diff --git a/src/application-lib/CMakeLists.txt b/src/application-lib/CMakeLists.txt
index d1a648e1..30e64b42 100644
--- a/src/application-lib/CMakeLists.txt
+++ b/src/application-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from application-lib.pro.
-
-#####################################################################
-## AppManApplication Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/common-lib/CMakeLists.txt b/src/common-lib/CMakeLists.txt
index 8976418e..ccc23990 100644
--- a/src/common-lib/CMakeLists.txt
+++ b/src/common-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from common-lib.pro.
-
-#####################################################################
-## AppManCommon Module:
-#####################################################################
qt_find_package(WrapLibYaml PROVIDED_TARGETS WrapLibYaml::WrapLibYaml)
diff --git a/src/crypto-lib/CMakeLists.txt b/src/crypto-lib/CMakeLists.txt
index ac4c8a4e..fe2138fa 100644
--- a/src/crypto-lib/CMakeLists.txt
+++ b/src/crypto-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from crypto-lib.pro.
-
-#####################################################################
-## AppManCrypto Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/dbus-lib/CMakeLists.txt b/src/dbus-lib/CMakeLists.txt
index 8d3a04c5..3c003503 100644
--- a/src/dbus-lib/CMakeLists.txt
+++ b/src/dbus-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from dbus-lib.pro.
-
-#####################################################################
-## AppManDBus Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
@@ -28,12 +23,7 @@ qt_internal_add_module(AppManDBusPrivate
Qt::DBus
)
-#### Keys ignored in scope 1:.:.:dbus-lib.pro:<TRUE>:
-# ADAPTORS_XML = "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml"
-# MODULE = "appman_dbus"
-# OTHER_FILES = "io.qt.packagemanager.xml" "io.qt.applicationmanager.applicationinterface.xml" "io.qt.applicationmanager.runtimeinterface.xml" "io.qt.applicationmanager.intentinterface.xml" "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml"
# QMAKE_EXTRA_TARGETS = "recreate-dbus-xml" "recreate-applicationmanager-dbus-xml" "recreate-packagemanager-dbus-xml" "recreate-windowmanager-dbus-xml"
-# TEMPLATE = "lib"
# recreate-applicationmanager-dbus-xml.CONFIG = "phony"
# recreate-applicationmanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager-lib/applicationmanager.h" "-o" "$$PWD/io.qt.applicationmanager.xml"
# recreate-dbus-xml.depends = "recreate-applicationmanager-dbus-xml" "recreate-applicationinstaller-dbus-xml" "recreate-windowmanager-dbus-xml"
diff --git a/src/intent-client-lib/CMakeLists.txt b/src/intent-client-lib/CMakeLists.txt
index fc932c17..3decb8dd 100644
--- a/src/intent-client-lib/CMakeLists.txt
+++ b/src/intent-client-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from intent-client-lib.pro.
-
-#####################################################################
-## AppManIntentClient Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/intent-server-lib/CMakeLists.txt b/src/intent-server-lib/CMakeLists.txt
index 30a6b020..8973f00a 100644
--- a/src/intent-server-lib/CMakeLists.txt
+++ b/src/intent-server-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from intent-server-lib.pro.
-
-#####################################################################
-## AppManIntentServer Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/launcher-lib/CMakeLists.txt b/src/launcher-lib/CMakeLists.txt
index bac50ba3..e1285a65 100644
--- a/src/launcher-lib/CMakeLists.txt
+++ b/src/launcher-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from launcher-lib.pro.
-
-#####################################################################
-## AppManLauncher Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/main-lib/CMakeLists.txt b/src/main-lib/CMakeLists.txt
index c89fe8ce..13d38de6 100644
--- a/src/main-lib/CMakeLists.txt
+++ b/src/main-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from main-lib.pro.
-
-#####################################################################
-## AppManMain Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/manager-lib/CMakeLists.txt b/src/manager-lib/CMakeLists.txt
index 99e34462..ee327e04 100644
--- a/src/manager-lib/CMakeLists.txt
+++ b/src/manager-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from manager-lib.pro.
-
-#####################################################################
-## AppManManager Module:
-#####################################################################
include(QtAppManHelpers)
diff --git a/src/monitor-lib/CMakeLists.txt b/src/monitor-lib/CMakeLists.txt
index 77746240..212bf1c1 100644
--- a/src/monitor-lib/CMakeLists.txt
+++ b/src/monitor-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from monitor-lib.pro.
-
-#####################################################################
-## AppManMonitor Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/notification-lib/CMakeLists.txt b/src/notification-lib/CMakeLists.txt
index b60ffac0..7a15ff52 100644
--- a/src/notification-lib/CMakeLists.txt
+++ b/src/notification-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from notification-lib.pro.
-
-#####################################################################
-## AppManNotification Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/package-lib/CMakeLists.txt b/src/package-lib/CMakeLists.txt
index 1130f09f..3180bf23 100644
--- a/src/package-lib/CMakeLists.txt
+++ b/src/package-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from package-lib.pro.
-
-#####################################################################
-## AppManPackage Module:
-#####################################################################
qt_find_package(WrapLibArchive PROVIDED_TARGETS WrapLibArchive::WrapLibArchive)
diff --git a/src/plugin-interfaces/CMakeLists.txt b/src/plugin-interfaces/CMakeLists.txt
index 21584521..6f469466 100644
--- a/src/plugin-interfaces/CMakeLists.txt
+++ b/src/plugin-interfaces/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from plugin-interfaces.pro.
-
-#####################################################################
-## AppManPluginInterfaces Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/shared-main-lib/CMakeLists.txt b/src/shared-main-lib/CMakeLists.txt
index 16ad324a..57ee84c4 100644
--- a/src/shared-main-lib/CMakeLists.txt
+++ b/src/shared-main-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from shared-main-lib.pro.
-
-#####################################################################
-## AppManSharedMain Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)
diff --git a/src/tools/appman/CMakeLists.txt b/src/tools/appman/CMakeLists.txt
index 092996d5..b58d0406 100644
--- a/src/tools/appman/CMakeLists.txt
+++ b/src/tools/appman/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from appman.pro.
-
-#####################################################################
-## appman Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman)
qt_internal_add_tool(${target_name}
diff --git a/src/tools/controller/CMakeLists.txt b/src/tools/controller/CMakeLists.txt
index d85f40f5..644ec9c5 100644
--- a/src/tools/controller/CMakeLists.txt
+++ b/src/tools/controller/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from controller.pro.
-
-#####################################################################
-## appman-controller Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman-controller)
qt_internal_add_tool(${target_name}
diff --git a/src/tools/dumpqmltypes/CMakeLists.txt b/src/tools/dumpqmltypes/CMakeLists.txt
index 1f48b9f7..16e623a1 100644
--- a/src/tools/dumpqmltypes/CMakeLists.txt
+++ b/src/tools/dumpqmltypes/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from dumpqmltypes.pro.
-
-#####################################################################
-## appman-dumpqmltypes Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman-dumpqmltypes)
qt_internal_add_tool(${target_name}
@@ -24,15 +19,6 @@ qt_internal_add_tool(${target_name}
Qt::AppManWindowPrivate
)
-#### Keys ignored in scope 1:.:.:dumpqmltypes.pro:<TRUE>:
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:dumpqmltypes.pro:NOT CMAKE_CROSSCOMPILING:
-# QT_TOOL_ENV = <EMPTY>
-
#### Keys ignored in scope 3:.:.:dumpqmltypes.pro:build_pass OR NOT debug_and_release:
# INSTALLS = "qmltypes_file"
# QMAKE_POST_LINK = "$$QMLPLUGINDUMP" "$$SOURCE_DIR/qmltypes"
diff --git a/src/tools/launcher-qml/CMakeLists.txt b/src/tools/launcher-qml/CMakeLists.txt
index 60da4b95..f29f60ec 100644
--- a/src/tools/launcher-qml/CMakeLists.txt
+++ b/src/tools/launcher-qml/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from launcher-qml.pro.
-
-#####################################################################
-## appman-launcher-qml Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman-launcher-qml)
qt_internal_add_tool(${target_name}
@@ -26,6 +21,3 @@ qt_internal_add_tool(${target_name}
Qt::AppManPluginInterfacesPrivate
Qt::AppManSharedMainPrivate
)
-
-#### Keys ignored in scope 1:.:.:launcher-qml.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/src/tools/packager/CMakeLists.txt b/src/tools/packager/CMakeLists.txt
index 02c6d3b7..2e206932 100644
--- a/src/tools/packager/CMakeLists.txt
+++ b/src/tools/packager/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from packager.pro.
-
-#####################################################################
-## appman-packager Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman-packager)
qt_internal_add_tool(${target_name}
diff --git a/src/tools/testrunner/CMakeLists.txt b/src/tools/testrunner/CMakeLists.txt
index 6d8e2bfe..e893b00a 100644
--- a/src/tools/testrunner/CMakeLists.txt
+++ b/src/tools/testrunner/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from testrunner.pro.
-
-#####################################################################
-## appman-qmltestrunner Tool:
-#####################################################################
qt_get_tool_target_name(target_name appman-qmltestrunner)
qt_internal_add_tool(${target_name}
diff --git a/src/tools/uploader/CMakeLists.txt b/src/tools/uploader/CMakeLists.txt
index bb6555ac..e95cfd69 100644
--- a/src/tools/uploader/CMakeLists.txt
+++ b/src/tools/uploader/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from uploader.pro.
-
-#####################################################################
-## package-uploader Tool:
-#####################################################################
qt_get_tool_target_name(target_name package-uploader)
qt_internal_add_tool(${target_name}
@@ -15,6 +10,3 @@ qt_internal_add_tool(${target_name}
Qt::Network
Qt::AppManCommonPrivate
)
-
-#### Keys ignored in scope 1:.:.:uploader.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/src/window-lib/CMakeLists.txt b/src/window-lib/CMakeLists.txt
index f959ebf2..96a8e522 100644
--- a/src/window-lib/CMakeLists.txt
+++ b/src/window-lib/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Generated from window-lib.pro.
-
-#####################################################################
-## AppManWindow Module:
-#####################################################################
# temporary hack to get around the "#pragma once not allowed in cpp" error
set(QT_FEATURE_headersclean FALSE)