summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto@kdab.com>2012-03-07 07:53:14 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-07 23:40:13 (GMT)
commit1e0021d8d9e374ae3959fcd4eac5d9e7238cbc54 (patch)
tree2cb0e30916bb9fe9503fbb304514251083a4ee3d
parent41ba5997bba81e225dbc449bb60ac86d88ed7fe3 (diff)
downloadQt-1e0021d8d9e374ae3959fcd4eac5d9e7238cbc54.zip
Qt-1e0021d8d9e374ae3959fcd4eac5d9e7238cbc54.tar.gz
Qt-1e0021d8d9e374ae3959fcd4eac5d9e7238cbc54.tar.bz2
Renaming QNX mkspecsv4.8.1
Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler> pattern. cherry-picked from qt5/qtbase 6e58dd34ac96e2cf0807a227caaef74d15e272e7 Change-Id: I793af8d1a2053ccf37aaefd5849267797d0ee021 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--config.tests/unix/iconv/iconv.pro2
-rw-r--r--mkspecs/unsupported/qnx-X11-g++/qmake.conf (renamed from mkspecs/unsupported/qnx-g++/qmake.conf)0
-rw-r--r--mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h (renamed from mkspecs/unsupported/qnx-g++/qplatformdefs.h)0
-rw-r--r--mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf (renamed from mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf)2
-rw-r--r--mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h)0
-rw-r--r--mkspecs/unsupported/qnx-x86-qcc/qmake.conf (renamed from mkspecs/unsupported/blackberry-x86-qcc/qmake.conf)2
-rw-r--r--mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h)0
7 files changed, 3 insertions, 3 deletions
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro
index ec573ce..876c6f3 100644
--- a/config.tests/unix/iconv/iconv.pro
+++ b/config.tests/unix/iconv/iconv.pro
@@ -1,3 +1,3 @@
SOURCES = iconv.cpp
CONFIG -= qt dylib app_bundle
-mac|win32-g++*|blackberry-*-qcc:LIBS += -liconv
+mac|win32-g++*|qnx-*-qcc:LIBS += -liconv
diff --git a/mkspecs/unsupported/qnx-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index e354b2c..e354b2c 100644
--- a/mkspecs/unsupported/qnx-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
diff --git a/mkspecs/unsupported/qnx-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
index e848982..e848982 100644
--- a/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
index f2407a6..76baa5c 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for blackberry-qcc
+# qmake configuration for qnx-qcc armv7 target
#
MAKEFILE_GENERATOR = UNIX
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
index 8ed9436..8ed9436 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
+++ b/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
index 93f1df2..fc7e4b4 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for blackberry-qcc
+# qmake configuration for qnx-qcc x86 target
#
MAKEFILE_GENERATOR = UNIX
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
index 8ed9436..8ed9436 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+++ b/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h