diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2017-04-26 01:29:39 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-05-29 21:39:08 +0000 |
| commit | f3ccb7bdfbd7ff8ff701c14a8c59f56b76ae7757 (patch) | |
| tree | 348c72fb90c3882b4424cdde1bac9f1cf796ad49 /qmake-features | |
| parent | 1f249e4fb9cb3cd809d9787c2cfdc02ddf42676e (diff) | |
Re-enable Android support
This mostly boils down to dealing with bionic vs glibc issues. Also updated
the Android build support files to a new copy from QtCreator 4.2.0.
Change-Id: Ib0390b7be0e6a3eb7cb5b092233ce00302c6360a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/am-config.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf index 241c921d..bee02bb6 100644 --- a/qmake-features/am-config.prf +++ b/qmake-features/am-config.prf @@ -14,7 +14,7 @@ win32-msvc*:QMAKE_CXXFLAGS += /FS /wd4290 /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS disable-installer:DEFINES *= AM_DISABLE_INSTALLER systemd-workaround:DEFINES *= AM_SYSTEMD_WORKAROUND headless:DEFINES *= AM_HEADLESS -linux:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE +linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE !force-single-process { linux|osx { |