diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-08-28 15:09:08 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-28 15:33:47 +0200 |
commit | 5a04101de680940f68735dcb6cfdf7f67eea0968 (patch) | |
tree | 16e61a558cddadba7796b21d007c0b7f50170a8b /mkspecs/android-g++ | |
parent | 627a394fb7ba1507bd028f81522244e7e085ef8d (diff) |
Android: Make qmake.conf usable for getting arch in Qt Creator
Qt Creator needs to parse the qmake.conf in order to get the
architecture for this Qt build when the Qt build is added.
At this point it does not know that it's reading an android
project, so it can't set the right environment variables. By
moving the error to the bottom, we let Creator parse the whole
file before getting an error, so that it can detect the options
it needs to define the Qt version.
Change-Id: I119523cb21e330dc5e957a6992476c4c3d4ab7b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'mkspecs/android-g++')
-rw-r--r-- | mkspecs/android-g++/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 8c0e8c91f6..4ff5341837 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -37,7 +37,6 @@ contains(QMAKE_HOST.os,Windows) { NDK_ROOT = $$(ANDROID_NDK_ROOT) !exists($$NDK_ROOT) { NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT - !exists($$NDK_ROOT): error("You need to set the ANDROID_NDK_ROOT environment variable to point to your Android NDK.") } NDK_HOST = $$(ANDROID_NDK_HOST) @@ -187,4 +186,6 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_ES1 = -lGLESv1_CM 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) |