diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-04-13 11:00:05 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 12:51:41 (GMT) |
| commit | ba0b8769ced01064551eec7718044ac3a3427a9b (patch) | |
| tree | d8b53098d7f8f59e1a33bf850b0804e64dbf459c | |
| parent | c7deafc99167d4115f5ff33d663e43dbbc1bc4da (diff) | |
| download | Qt-ba0b8769ced01064551eec7718044ac3a3427a9b.zip Qt-ba0b8769ced01064551eec7718044ac3a3427a9b.tar.gz Qt-ba0b8769ced01064551eec7718044ac3a3427a9b.tar.bz2 | |
Enable stack smashing protection on Blackberry platforms
Backport of:
657ca81c910638128f533b7eb98edf187bd40a0c
1c20c3f29441a6856c6eb58dda40b86bdaac6a06
from qtbase.
Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/blackberry-x86-qcc/qmake.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf index df9961b..4e72667 100644 --- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf +++ b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf @@ -6,4 +6,7 @@ DEFINES += Q_OS_BLACKBERRY CONFIG += blackberry LIBS += -lbps +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + include(../qnx-armv7le-qcc/qmake.conf) diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf index 2cb405c..60b67f8 100644 --- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf +++ b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf @@ -6,4 +6,7 @@ DEFINES += Q_OS_BLACKBERRY CONFIG += blackberry LIBS += -lbps +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + include(../qnx-x86-qcc/qmake.conf) |