summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-04-23 17:08:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-24 14:30:13 +0200
commitffb769b385f11aa9598fd11893fe5c267c5ab01c (patch)
tree861528e3756044256caba118a6c65d73aa8dc688 /src/core/gyp_run.pro
parent76f2298dffdafb73d80cb21b49a7ed7ea1b7830c (diff)
Update eAndroid for new snapshot
This patch adds configurations and updates command line switches. Change-Id: I0223695cc3a743bb2364a73e56fe5391dc43663d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/gyp_run.pro')
-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 515febeb8..43801c8ae 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -7,8 +7,8 @@ TEMPLATE = aux
cross_compile {
GYP_ARGS = "-D qt_cross_compile=1"
posix: GYP_ARGS += "-D os_posix=1"
- linux: include(config/embedded_linux.pri)
android: include(config/embedded_android.pri)
+ else:linux: include(config/embedded_linux.pri)
} else {
# !cross_compile
GYP_ARGS = "-D qt_cross_compile=0"