diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 07:18:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 10:29:37 +0200 |
| commit | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (patch) | |
| tree | e60f1f43e9670e82923e3c2d0d19b29198b9c300 /mkspecs/qnx-x86-64-qcc/qmake.conf | |
| parent | 930e750b7aca024b839c9856cfcc79aab8c0abbc (diff) | |
| parent | f4be16e1f7828a0f6992ef2e20b9106177d7fc88 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/angle/src/libGLESv2/libGLESv2.pro
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
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 +} |