diff options
| author | Wolfgang Bremer <wbremer@blackberry.com> | 2013-08-19 12:03:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-28 01:57:25 +0200 |
| commit | 9de144f4b15b1b97d55922e3e0bc846080c5bb62 (patch) | |
| tree | 68efc774b32f4392d2a63eb4e48b2c9eb3d7d675 /mkspecs/blackberry-armv7le-qcc | |
| parent | db87c9ead295c5cf4570f90a9f529e12b3169c40 (diff) | |
Revert "Add the same flags for the c++ compiler as they are already defined for the c compiler"
The previous commit was unnecessary.
The value of QMAKE_CFLAGS is used for QMAKE_CXXFLAGS as well.
This is done in qcc-base.conf, which is included via
blackberry-armv7le.conf -> qcc-base-qnx-armv7le.conf -> qcc-base-qnx.conf -> qcc-base.conf
Currently, the BlackBerry arm compiler calls show duplicate entries.
This reverts commit 539f90e9719998e57f17086178eeccdf34f19465.
Change-Id: I6e055ce9aafd16e91e15817946b7561bd76ee43e
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'mkspecs/blackberry-armv7le-qcc')
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf index cfcd2aecf0..2e24e4e0d3 100644 --- a/mkspecs/blackberry-armv7le-qcc/qmake.conf +++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf @@ -16,7 +16,6 @@ contains(QT_CONFIG, stack-protector-strong) { } QMAKE_CFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mthumb -D_FORTIFY_SOURCE=2 -QMAKE_CXXFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mthumb -D_FORTIFY_SOURCE=2 QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now |