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/qnx-x86-64-qcc/qmake.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/qnx-x86-64-qcc/qmake.conf')
| -rw-r--r-- | mkspecs/qnx-x86-64-qcc/qmake.conf | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mkspecs/qnx-x86-64-qcc/qmake.conf b/mkspecs/qnx-x86-64-qcc/qmake.conf new file mode 100644 index 0000000000..f1760e4072 --- /dev/null +++ b/mkspecs/qnx-x86-64-qcc/qmake.conf @@ -0,0 +1,17 @@ +# +# qmake configuration for qnx x86-64 systems +# + +DEFINES += QT_NO_CLIPBOARD + +QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now + +include(../common/qcc-base-qnx-x86-64.conf) + +contains(QT_CONFIG, stack-protector-strong) { + QMAKE_CFLAGS += -fstack-protector-strong + QMAKE_CXXFLAGS += -fstack-protector-strong +} else { + QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + QMAKE_CXXFLAGS += -fstack-protector -fstack-protector-all +} |