diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-08-11 03:36:20 +0200 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-08-24 08:21:58 +0000 |
| commit | 9a9fe31eab39bf2dff6232b32aeedd955e4ad5ef (patch) | |
| tree | 3ac732a8e753eb0f4cc407dc627b8dc0b34b38ae /qmake-features | |
| parent | 1c295f784a21f2f7fc0c32166b1faea6a8864f90 (diff) | |
Add basic iOS support. Fix all "macOS" references
This adds the basics to compile all of the AM as well as Neptune-3 for iOS.
Actually running everything automatically through QtCreator needs a few
more tweaks in qmake/installation rules to correctly deploy.
Change-Id: Iaf17594b9944e36510ff47cf15668a12e3a08af6
Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/am-config.prf | 2 | ||||
| -rw-r--r-- | qmake-features/config-output.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf index 165b4334..7bb0232c 100644 --- a/qmake-features/am-config.prf +++ b/qmake-features/am-config.prf @@ -20,7 +20,7 @@ config_touchemulation:DEFINES += AM_ENABLE_TOUCH_EMULATION linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE !force-single-process { - linux|osx { + linux|macos { headless|if(qtHaveModule(waylandcompositor)) { CONFIG *= auto-multi-process } diff --git a/qmake-features/config-output.prf b/qmake-features/config-output.prf index fdcf5213..9527fe34 100644 --- a/qmake-features/config-output.prf +++ b/qmake-features/config-output.prf @@ -14,7 +14,7 @@ defineTest(printConfigLine) { isEmpty(width):width = 30 unix:system("test -t 2") { # check if we are on unix and stderr is a tty - osx:echo="echo" + macos:echo="echo" else:echo="/bin/echo -e" equals(color, "auto") { |