diff options
| author | BogDan Vatra <bogdan@kde.org> | 2015-01-30 15:30:59 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2015-02-03 10:14:57 +0000 |
| commit | cc4c684e03ce85c1920afedd6c5efe5ab8822e4a (patch) | |
| tree | 2e18ffb72c7b82341525b362845623ff0cc1bbc3 | |
| parent | f562244f33dc0e7068cc651ee558597d9597b299 (diff) | |
Overwrite QMAKE_DEFAULT_XXXDIRS values.
If we set ANDROID_NDK_PLATFORM env variable, QMAKE_DEFAULT_XXXDIRS still contains
old ANDROID_PLATFORM, so we need to overwrite it.
Change-Id: I917e24caa11bd589966b3fb11be3a9f3c4370b3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index b0fea50206..26730de303 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -205,3 +205,6 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 !exists($$NDK_ROOT): error("You need to set the ANDROID_NDK_ROOT environment variable to point to your Android NDK.") load(qt_config) + +QMAKE_DEFAULT_LIBDIRS = $$QMAKE_LIBDIR +QMAKE_DEFAULT_INCDIRS = $$QMAKE_INCDIR |