summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-19 13:09:18 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-19 13:37:50 +0200
commit52bba25402541506c495c28774386317f8f78cbf (patch)
treeafa78ece1d03e5aa5d7e0661dce0ddea3a26aa7b
parent65cc517142ba4ffa8a63482dabd4e2e08498726e (diff)
Fix the build on eAdroid
The eAndroid mkspec also sets linux, and since the qnx change we ended up including both android and linux configs. Make it more obvious why the else is there. Change-Id: Ia97483d410e280bbb4f4b56cf6fd351f6a4bbbca Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
-rw-r--r--src/core/gyp_run.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index aec004e5..ed592e1f 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -9,7 +9,7 @@ cross_compile {
posix: GYP_ARGS += "-D os_posix=1"
android: include(config/embedded_android.pri)
qnx: include(config/embedded_qnx.pri)
- else:linux: include(config/embedded_linux.pri)
+ linux:!android: include(config/embedded_linux.pri)
} else {
# !cross_compile
GYP_ARGS = "-D qt_cross_compile=0"