diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/device_config.prf | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index ec0d27873d..5233ccc610 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -27,6 +27,7 @@ QMAKE_LIBS_NETWORK = -lsocket # OpenGL libraries have a dependency on libEGL QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -lEGL QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL +QMAKE_LIBS_EGL = -lEGL # When using this mkspec to build Qt apps (ie - not Qt itself) we want to build # against the NDK's target directory which is referenced by the QNX_TARGET environment diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 90bf9150e9..020b3ad7bb 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -22,6 +22,11 @@ isEmpty(DEVICE_PRI) { exists($$DEVICE_PRI):include($$DEVICE_PRI) +isEmpty(CROSS_COMPILE) { + #this variable can be persisted via qmake -set CROSS_COMPILE /foo + CROSS_COMPILE = $$[CROSS_COMPILE] +} + unset(DEVICE_PRI) unset(DIR) |