summaryrefslogtreecommitdiff
path: root/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-06-29 14:19:07 +0200
committerRobert Griebl <robert.griebl@qt.io>2022-06-30 12:26:04 +0000
commita1c90ed4605b08c39d380d2605d26b684d340c64 (patch)
tree8b76a66bd594abb02e9801858d0168f90efcbdef /examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
parent0b895aa93688926781e30fa5400832396e9c8bef (diff)
downloadqtapplicationmanager-a1c90ed4605b08c39d380d2605d26b684d340c64.tar.gz
Prevent linking of AppMan modules into user plugins
As the AppMan modules are static libraries, linking any of them into a QML plugin (that later gets loaded into the system-ui) will lead to a bunch of problems: 1) due to symbol duplication and duplicate static data, a lot of singletons may exist twice 2) all static constructors (logging, crash-handling, etc.) are run a second time, overriding any custom configuration that was applied after config parsing. If you are legitimately building a custom appman binary, a custom launcher or a native app using launcher-lib, you need to flag this via compile-time defines now: Either AM_COMPILING_APPMAN or AM_COMPILING_LAUNCHER AM_COMPILING_LAUNCHER is also used for native apps using launcher-lib. Change-Id: I0c1a3fb7e0c7121f92d44c764c2c1eeb720e7041 Pick-to: 6.4 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp')
-rw-r--r--examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
index 4fcdb23d..a9c8ebe0 100644
--- a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
+++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
@@ -6,7 +6,6 @@
#include <tuple>
#include <QtDBus/QtDBus>
-#include <QtAppManCommon/global.h>
#include <QJsonDocument>
#include <QSocketNotifier>
#include <QMetaObject>
@@ -52,7 +51,6 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QMap<QString,QStr
QT_END_NAMESPACE
-QT_USE_NAMESPACE_AM
// unfortunately, this is a copy of the code from debugwrapper.cpp
static QStringList substituteCommand(const QStringList &debugWrapperCommand, const QString &program,