diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-23 13:23:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 14:24:55 +0200 |
commit | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (patch) | |
tree | 08dc64d9960346c4b27f42c7e58ef9d8885ac760 /mkspecs/common/qcc-base-qnx-x86-64.conf | |
parent | b24396b925c78a59ef4a59d69a6b2633887aaf2f (diff) | |
parent | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/common/mac.conf
mkspecs/features/configure_base.prf
mkspecs/features/configure.prf
mkspecs/macx-clang-32/qmake.conf
mkspecs/macx-clang/qmake.conf
mkspecs/macx-ios-clang/qmake.conf
src/network/ssl/qsslsocket_openssl_symbols_p.h
Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
Diffstat (limited to 'mkspecs/common/qcc-base-qnx-x86-64.conf')
-rw-r--r-- | mkspecs/common/qcc-base-qnx-x86-64.conf | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/mkspecs/common/qcc-base-qnx-x86-64.conf b/mkspecs/common/qcc-base-qnx-x86-64.conf new file mode 100644 index 0000000000..fd04104f71 --- /dev/null +++ b/mkspecs/common/qcc-base-qnx-x86-64.conf @@ -0,0 +1,23 @@ +# +# qmake configuration for qnx-qcc x86-64 targets +# + +MAKEFILE_GENERATOR = UNIX + +include(g++-unix.conf) +include(unix.conf) + +QMAKE_CC = qcc -Vgcc_ntox86_64 +QMAKE_CXX = qcc -Vgcc_ntox86_64 +QNX_CPUDIR = x86_64 + +include(qcc-base-qnx.conf) + +QMAKE_AR = ntox86_64-ar cqs +QMAKE_OBJCOPY = ntox86_64-objcopy +QMAKE_NM = ntox86_64-nm -P +QMAKE_RANLIB = ntox86_64-ranlib + +QMAKE_STRIP = ntox86_64-strip + +load(qt_config) |