diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 10:25:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-26 10:25:14 +0000 |
| commit | d34be3243419246d3b4966f6be8e345747723184 (patch) | |
| tree | 4ac7a8698d0a30f17f3b8f542a1f88a1fe977aa4 /mkspecs | |
| parent | 011aeb131ed904d948b69d6444ff58cdbfd4990c (diff) | |
| parent | bce25a6340309938e06222663c2c7758bafab6e2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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) |