diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
| commit | 50aeedd86ce0244fbb77ebefdce8da72db881e45 (patch) | |
| tree | 209b0e39b8bde2e43da9497ab327767679ebbdb6 /mkspecs | |
| parent | 08dea594fe4a55d7546a17773f84f44de2c2d200 (diff) | |
| parent | 17d72c783747dd8d9ce767002988d5d5a54a790e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
src/corelib/tools/qdatetimeparser_p.h
Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index c33bbe7eed..3e621c7d77 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -6,6 +6,7 @@ QMAKE_COMPILER = gcc clang llvm CONFIG += android_install unversioned_soname unversioned_libname plugin_with_soname android_deployment_settings include(../common/linux.conf) +include(../common/gcc-base-unix.conf) include(../common/clang.conf) include(../common/android-base-head.conf) |