diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-02 15:07:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 16:26:21 +0200 |
| commit | 0a3eb0fe443f8158d81d97cde8f0c9a9632fb9f0 (patch) | |
| tree | 7bbdc72a7e30e23fc66a610ff7e3cd298711e5b1 /configure | |
| parent | cee7380c0470dc591e2aafb3225641d4194ab05c (diff) | |
| parent | 190fa97c83472863fd886e86f626ab8196ed51b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1067,7 +1067,7 @@ CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT CFG_DEFAULT_ANDROID_PLATFORM=android-9 CFG_DEFAULT_ANDROID_TARGET_ARCH=armeabi-v7a -CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.7 +CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.8 CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST if [ -d "$relpath/src/plugins/sqldrivers" ]; then |