From a6a865e24999bf878f6f80341b7fc14f2b67a05e Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Mon, 12 Jan 2015 13:21:31 -0200 Subject: QNX: Rename qcc-base-qnx-armv7le.conf mkspec. The "new" convention uses armle-v7 instead of armv7le. Change-Id: Ica7016b7b0b4e374771ff423b7b0bfec4851ee95 Reviewed-by: Wolfgang Bremer Reviewed-by: Oswald Buddenhagen --- mkspecs/blackberry-armle-v7-qcc/qmake.conf | 4 ++-- mkspecs/common/qcc-base-qnx-armle-v7.conf | 23 ++++++++++++++++++++++ mkspecs/common/qcc-base-qnx-armv7le.conf | 23 ---------------------- .../blackberry-playbook-armle-v7-qcc/qmake.conf | 2 +- mkspecs/qnx-armle-v7-qcc/qmake.conf | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 mkspecs/common/qcc-base-qnx-armle-v7.conf delete mode 100644 mkspecs/common/qcc-base-qnx-armv7le.conf 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-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf new file mode 100644 index 0000000000..331a65b2bf --- /dev/null +++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf @@ -0,0 +1,23 @@ +# +# qmake configuration for qnx-qcc armv7 targets +# + +MAKEFILE_GENERATOR = UNIX + +include(g++-unix.conf) +include(unix.conf) + +QMAKE_CC = qcc -Vgcc_ntoarmv7le +QMAKE_CXX = qcc -Vgcc_ntoarmv7le +QNX_CPUDIR = armle-v7 + +include(qcc-base-qnx.conf) + +QMAKE_AR = ntoarmv7-ar cqs +QMAKE_OBJCOPY = ntoarmv7-objcopy +QMAKE_NM = ntoarmv7-nm -P +QMAKE_RANLIB = ntoarmv7-ranlib + +QMAKE_STRIP = ntoarmv7-strip + +load(qt_config) diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf deleted file mode 100644 index 331a65b2bf..0000000000 --- a/mkspecs/common/qcc-base-qnx-armv7le.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# qmake configuration for qnx-qcc armv7 targets -# - -MAKEFILE_GENERATOR = UNIX - -include(g++-unix.conf) -include(unix.conf) - -QMAKE_CC = qcc -Vgcc_ntoarmv7le -QMAKE_CXX = qcc -Vgcc_ntoarmv7le -QNX_CPUDIR = armle-v7 - -include(qcc-base-qnx.conf) - -QMAKE_AR = ntoarmv7-ar cqs -QMAKE_OBJCOPY = ntoarmv7-objcopy -QMAKE_NM = ntoarmv7-nm -P -QMAKE_RANLIB = ntoarmv7-ranlib - -QMAKE_STRIP = ntoarmv7-strip - -load(qt_config) 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 -- cgit v1.2.3