From 52bba25402541506c495c28774386317f8f78cbf Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Mon, 19 May 2014 13:09:18 +0200
Subject: [PATCH] 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>
---
src/core/gyp_run.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index aec004e52..ed592e1fd 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"
--
GitLab