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 <[email protected]> Reviewed-by: Andreas Holzammer <[email protected]> Reviewed-by: Thomas McGuire <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Thiago Macieira <[email protected]>
petrmanek · Sep 4, 2012 · 219ba05 · 219ba05
1 parent f8f78a4
commit 219ba05
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/...pported/blackberry-armv7le-qcc/qmake.conf → mkspecs/blackberry-armv7le-qcc/qmake.conf b/...pported/blackberry-armv7le-qcc/qmake.conf → 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/...ed/blackberry-armv7le-qcc/qplatformdefs.h → ...cs/blackberry-armv7le-qcc/qplatformdefs.h b/...ed/blackberry-armv7le-qcc/qplatformdefs.h → ...cs/blackberry-armv7le-qcc/qplatformdefs.h
diff --git a/...unsupported/blackberry-x86-qcc/qmake.conf → mkspecs/blackberry-x86-qcc/qmake.conf b/...unsupported/blackberry-x86-qcc/qmake.conf → 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/...ported/blackberry-x86-qcc/qplatformdefs.h → mkspecs/blackberry-x86-qcc/qplatformdefs.h b/...ported/blackberry-x86-qcc/qplatformdefs.h → mkspecs/blackberry-x86-qcc/qplatformdefs.h
diff --git a/...cs/unsupported/qnx-armv7le-qcc/qmake.conf → mkspecs/qnx-armv7le-qcc/qmake.conf b/...cs/unsupported/qnx-armv7le-qcc/qmake.conf → 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/...s/unsupported/qnx-x86-qcc/qplatformdefs.h → mkspecs/qnx-armv7le-qcc/qplatformdefs.h b/...s/unsupported/qnx-x86-qcc/qplatformdefs.h → 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 → mkspecs/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf → 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/...supported/qnx-armv7le-qcc/qplatformdefs.h → mkspecs/qnx-x86-qcc/qplatformdefs.h b/...supported/qnx-armv7le-qcc/qplatformdefs.h → 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