diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-08 10:06:01 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-08-08 15:37:13 +0200 |
| commit | 124c3218d11e34809c3c4099cfe449dff9150785 (patch) | |
| tree | 56e30db2101454c627232ae10d8906673bcdc822 | |
| parent | cada82334da605e53bc1cc01f57c215643adae5a (diff) | |
| parent | e49107e72c12f931a3d2c20c67195fec6513a783 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
qmake-features/am-config.prf
src/main-lib/main.cpp
src/manager-lib/applicationmanager.cpp
src/monitor-lib/monitor-lib.pro
Change-Id: I4aa0f2c901480d1f04f4260fe4ab1e005369432e
| -rw-r--r-- | application-manager.pro | 2 | ||||
| -rw-r--r-- | qmake-features/am-config.prf | 4 | ||||
| -rw-r--r-- | src/monitor-lib/systemreader.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/application-manager.pro b/application-manager.pro index b4b39fb9..62771a35 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -25,7 +25,7 @@ else:contains(QT_BUILD_PARTS, "examples"):CONFIG += enable-examples !headless:qtHaveModule(gui):qtCompileTest(touchemulation) } -qtHaveModule(waylandcompositor):CONFIG += am_compatible_compositor +qtHaveModule(waylandcompositor):qtHaveModule(quick):qtConfig(opengl):CONFIG += am_compatible_compositor load(am-config) diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf index 113013e7..d115eb63 100644 --- a/qmake-features/am-config.prf +++ b/qmake-features/am-config.prf @@ -5,7 +5,9 @@ CONFIG *= no_private_qt_headers_warning hide_symbols CONFIG -= app_bundle qml_debug CONFIG += exceptions -!qtHaveModule(gui):CONFIG *= headless +!qtHaveModule(gui)|!qtHaveModule(quick)|!qtConfig(opengl) { + CONFIG *= headless +} DEFINES += QT_MESSAGELOGCONTEXT diff --git a/src/monitor-lib/systemreader.cpp b/src/monitor-lib/systemreader.cpp index d01dc273..67692fe1 100644 --- a/src/monitor-lib/systemreader.cpp +++ b/src/monitor-lib/systemreader.cpp @@ -71,11 +71,11 @@ QT_END_NAMESPACE_AM # include <QSocketNotifier> # include <QProcess> # include <QCoreApplication> +# include <QAtomicInteger> # if !defined(AM_HEADLESS) # include <QOffscreenSurface> # include <QOpenGLContext> # include <QOpenGLFunctions> -# include <QAtomicInteger> # endif # include <sys/eventfd.h> |