summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-13 10:20:19 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-12 16:03:47 +0200
commit4183feaa95a80aa83339163730be16f8051e9822 (patch)
tree500e90066d9c5af92306f70677663f13ce453e20 /mkspecs
parent8b6070804436aec3bbf5b896e66e6f195a744e02 (diff)
remove -fno-stack-protector
there is no need to disable stack protector unless one uses an ancient version of gcc. taken from kubuntu. (cherry picked from commit 30211e6847007bf375f60f62f5806b05cec810c3) Change-Id: Idd74823176a63002cc0f6511adc6a981bef79df9 Reviewed-on: http://codereview.qt-project.org/4571 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/qws/linux-lsb-g++/qmake.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-lsb-g++/qmake.conf b/mkspecs/qws/linux-lsb-g++/qmake.conf
index 4b359258fb..988a6ea5c9 100644
--- a/mkspecs/qws/linux-lsb-g++/qmake.conf
+++ b/mkspecs/qws/linux-lsb-g++/qmake.conf
@@ -14,11 +14,10 @@ QMAKE_LSB = 1
# modifications to g++.conf
QMAKE_CC = lsbcc
QMAKE_CXX = lsbc++
-QMAKE_CFLAGS = -pipe -DQT_LINUXBASE -fno-stack-protector
+QMAKE_CFLAGS = -pipe -DQT_LINUXBASE
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_LINK = lsbc++
QMAKE_LINK_SHLIB = lsbc++
-QMAKE_LFLAGS += -fno-stack-protector
load(qt_config)