summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer.qnx@kdab.com>2012-04-13 12:00:05 +0100
committerQt by Nokia <qt-info@nokia.com>2012-04-13 14:51:41 +0200
commitba0b8769ced01064551eec7718044ac3a3427a9b (patch)
treed8b53098d7f8f59e1a33bf850b0804e64dbf459c /mkspecs
parentc7deafc99167d4115f5ff33d663e43dbbc1bc4da (diff)
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>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf3
-rw-r--r--mkspecs/unsupported/blackberry-x86-qcc/qmake.conf3
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 df9961b107..4e72667c5d 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 2cb405cd51..60b67f801e 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)