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 /qmake-features | |
| 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
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/am-config.prf | 4 |
1 files changed, 3 insertions, 1 deletions
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 |