summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2015-01-12 13:21:31 -0200
committerRafael Roquetto <rafael.roquetto@kdab.com>2015-01-18 00:13:09 +0100
commita6a865e24999bf878f6f80341b7fc14f2b67a05e (patch)
tree92335e434d9d6eda4ae6e1321e48d7394ac1cef5
parent3f0ce8c0c88e7839f584bbae50a024a90f653370 (diff)
QNX: Rename qcc-base-qnx-armv7le.conf mkspec.
The "new" convention uses armle-v7 instead of armv7le. Change-Id: Ica7016b7b0b4e374771ff423b7b0bfec4851ee95 Reviewed-by: Wolfgang Bremer <wolfgang@w-bremer.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/blackberry-armle-v7-qcc/qmake.conf4
-rw-r--r--mkspecs/common/qcc-base-qnx-armle-v7.conf (renamed from mkspecs/common/qcc-base-qnx-armv7le.conf)0
-rw-r--r--mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf2
-rw-r--r--mkspecs/qnx-armle-v7-qcc/qmake.conf2
4 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/blackberry-armle-v7-qcc/qmake.conf b/mkspecs/blackberry-armle-v7-qcc/qmake.conf
index 2fb367b8a4..8280d77a96 100644
--- a/mkspecs/blackberry-armle-v7-qcc/qmake.conf
+++ b/mkspecs/blackberry-armle-v7-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for blackberry armv7le systems
+# qmake configuration for blackberry armle-v7 systems
#
load(qt_config)
@@ -19,4 +19,4 @@ QMAKE_CFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mthumb -D_FORTIFY_SOURCE=2
QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
-include(../common/qcc-base-qnx-armv7le.conf)
+include(../common/qcc-base-qnx-armle-v7.conf)
diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf
index 331a65b2bf..331a65b2bf 100644
--- a/mkspecs/common/qcc-base-qnx-armv7le.conf
+++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf
diff --git a/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf
index c9c883a206..d14a5d644a 100644
--- a/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf
+++ b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for the Blackberry Playbook armv7le
+# qmake configuration for the Blackberry Playbook armle-v7
#
include(../../blackberry-armle-v7-qcc/qmake.conf)
diff --git a/mkspecs/qnx-armle-v7-qcc/qmake.conf b/mkspecs/qnx-armle-v7-qcc/qmake.conf
index 8dd84811c1..b77455044c 100644
--- a/mkspecs/qnx-armle-v7-qcc/qmake.conf
+++ b/mkspecs/qnx-armle-v7-qcc/qmake.conf
@@ -2,6 +2,6 @@
# qmake configuration for qnx-qcc armv7 targets
#
-include(../common/qcc-base-qnx-armv7le.conf)
+include(../common/qcc-base-qnx-armle-v7.conf)
DEFINES += QT_NO_CLIPBOARD