QNX: Move qpa-based mkspecs out of the unsupported directory

RIM is committed to supporting Qt on its platforms and the port works
well.

Change-Id: Id6bfea2dbc178800adad89d436ce31c40d3eb652
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf
similarity index 83%
rename from mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
rename to mkspecs/blackberry-armv7le-qcc/qmake.conf
index efb585b..4a8cde7 100644 (file)
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf
@@ -9,4 +9,4 @@ LIBS += -lbps
 # Blackberry also has support for stack smashing protection in its libc
 QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
 
-include(../../common/qcc-base-qnx-armv7le.conf)
+include(../common/qcc-base-qnx-armv7le.conf)

diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
similarity index 100%
rename from mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
rename to mkspecs/blackberry-armv7le-qcc/qplatformdefs.h

diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/blackberry-x86-qcc/qmake.conf
similarity index 84%
rename from mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
rename to mkspecs/blackberry-x86-qcc/qmake.conf
index 3fd84c1..24bbffe 100644 (file)
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/blackberry-x86-qcc/qmake.conf
@@ -9,4 +9,4 @@ LIBS += -lbps
 # Blackberry also has support for stack smashing protection in its libc
 QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
 
-include(../../common/qcc-base-qnx-x86.conf)
+include(../common/qcc-base-qnx-x86.conf)

diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/blackberry-x86-qcc/qplatformdefs.h
similarity index 100%
rename from mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
rename to mkspecs/blackberry-x86-qcc/qplatformdefs.h

diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/qnx-armv7le-qcc/qmake.conf
similarity index 62%
rename from mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
rename to mkspecs/qnx-armv7le-qcc/qmake.conf
index 37c66cd..8dd8481 100644 (file)
--- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+++ b/mkspecs/qnx-armv7le-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-armv7le.conf)
 
 DEFINES += QT_NO_CLIPBOARD

diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
similarity index 98%
rename from mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
rename to mkspecs/qnx-armv7le-qcc/qplatformdefs.h
index 8ef80c4..495446c 100644 (file)
--- a/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
+++ b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
@@ -84,7 +84,7 @@
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
 #define QT_NO_READDIR64
-#include "../../common/posix/qplatformdefs.h"
+#include "../common/posix/qplatformdefs.h"
 
 #define QT_SNPRINTF ::snprintf
 #define QT_VSNPRINTF ::vsnprintf

diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/qnx-x86-qcc/qmake.conf
similarity index 64%
rename from mkspecs/unsupported/qnx-x86-qcc/qmake.conf
rename to mkspecs/qnx-x86-qcc/qmake.conf
index cf588ba..36a3ba2 100644 (file)
--- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+++ b/mkspecs/qnx-x86-qcc/qmake.conf
@@ -2,6 +2,6 @@
 # qmake configuration for qnx-qcc x86 targets
 #
 
-include(../../common/qcc-base-qnx-x86.conf)
+include(../common/qcc-base-qnx-x86.conf)
 
 DEFINES += QT_NO_CLIPBOARD

diff --git a/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h
similarity index 98%
rename from mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
rename to mkspecs/qnx-x86-qcc/qplatformdefs.h
index 8ef80c4..495446c 100644 (file)
--- a/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
+++ b/mkspecs/qnx-x86-qcc/qplatformdefs.h
@@ -84,7 +84,7 @@
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
 #define QT_NO_READDIR64
-#include "../../common/posix/qplatformdefs.h"
+#include "../common/posix/qplatformdefs.h"
 
 #define QT_SNPRINTF ::snprintf
 #define QT_VSNPRINTF ::vsnprintf