diff options
author | BogDan Vatra <bogdan@kdab.com> | 2017-07-28 16:52:31 +0300 |
---|---|---|
committer | Sérgio Martins <sergio.martins@kdab.com> | 2017-08-23 12:47:58 +0000 |
commit | 09ea013ae17caad7d973fb05287a634dba2768c9 (patch) | |
tree | 4be46f69a069c1da87b1f998f828dcf2581312e0 /mkspecs/features/android | |
parent | 2740584e6de5ec2999e0e44f363bc18b9252dc23 (diff) |
Use libc++ instead of libstdc++ when compiling with android-clang mkspec
clang+libc++ is the only supported way by Google nowadays.
libstdc++ is too old and already fails to build some C++11 apps
e.g. missing std::to_string().
android-g++ mkspec still uses libstdc++ and g++.
Use -isystem to include system headers instead of QMAKE_INCDIR_POST (-I).
Task-number: QTBUG-60455
Change-Id: Iba8b04594c2e5e2832e6cf480e4e52ff31ad4106
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs/features/android')
-rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 9fe1e26075..913ab71412 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -62,6 +62,7 @@ contains(TEMPLATE, ".*app"):!build_pass: { isEmpty(QML_ROOT_PATH): \ QML_ROOT_PATH = $$_PRO_FILE_PWD_ FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," + FILE_CONTENT += " \"stdcpp-path\": $$emitString($$ANDROID_STDCPP_PATH)," FILE_CONTENT += " \"application-binary\": $$emitString($$absolute_path($$DESTDIR, $$OUT_PWD)/$$TARGET)" FILE_CONTENT += "}" |