summaryrefslogtreecommitdiffstats
path: root/qmake-features
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2020-11-24 14:56:30 +0100
committerRobert Griebl <robert.griebl@qt.io>2020-11-28 17:47:56 +0100
commitd744705d5498c38ede36dbbdaade2b0ab7046ae9 (patch)
treedac2effb5d4863b594e80abcc51faf796ab7de77 /qmake-features
parentf24f72abac9b6a990958d8b41aaf4dcd8a592e4c (diff)
Remove legacy functionality: headless, pssdp and pshellserver
Change-Id: Iffeaa944cce5d09d0a1d1af2d85aa5f5034b7f71 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'qmake-features')
-rw-r--r--qmake-features/am-config.prf7
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf
index 412eb2df..82ebd7c6 100644
--- a/qmake-features/am-config.prf
+++ b/qmake-features/am-config.prf
@@ -5,10 +5,6 @@ CONFIG *= no_private_qt_headers_warning hide_symbols
CONFIG -= app_bundle qml_debug
CONFIG += exceptions
-!qtHaveModule(gui)|!qtHaveModule(quick)|!qtConfig(opengl) {
- CONFIG *= headless
-}
-
DEFINES += QT_MESSAGELOGCONTEXT QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
# CONFIG += sanitizer sanitize_address sanitize_undefined
@@ -18,7 +14,6 @@ win32-msvc*:QMAKE_CXXFLAGS += /FS /wd4290 /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS
disable-installer:DEFINES *= AM_DISABLE_INSTALLER
disable-external-dbus-interfaces:DEFINES *= AM_DISABLE_EXTERNAL_DBUS_INTERFACES
systemd-workaround:DEFINES *= AM_SYSTEMD_WORKAROUND
-headless:DEFINES *= AM_HEADLESS
enable-widgets:DEFINES *= AM_ENABLE_WIDGETS
config_touchemulation:DEFINES += AM_ENABLE_TOUCH_EMULATION
!disable-libbacktrace:if(linux:!android:if(enable-libbacktrace|CONFIG(debug, debug|release))|macos): DEFINES *= AM_USE_LIBBACKTRACE
@@ -26,7 +21,7 @@ windows:msvc:!disable-stackwalker: DEFINES *= AM_USE_STACKWALKER
!force-single-process {
linux|macos {
- headless|if(qtHaveModule(waylandcompositor)) {
+ if(qtHaveModule(waylandcompositor)) {
CONFIG *= auto-multi-process
}
}