From 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Tue, 4 Sep 2012 10:42:23 +0100 Subject: [PATCH] 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 Reviewed-by: Andreas Holzammer Reviewed-by: Thomas McGuire Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- mkspecs/{unsupported => }/blackberry-armv7le-qcc/qmake.conf | 2 +- .../{unsupported => }/blackberry-armv7le-qcc/qplatformdefs.h | 0 mkspecs/{unsupported => }/blackberry-x86-qcc/qmake.conf | 2 +- mkspecs/{unsupported => }/blackberry-x86-qcc/qplatformdefs.h | 0 mkspecs/{unsupported => }/qnx-armv7le-qcc/qmake.conf | 2 +- .../qnx-x86-qcc => qnx-armv7le-qcc}/qplatformdefs.h | 2 +- mkspecs/{unsupported => }/qnx-x86-qcc/qmake.conf | 2 +- .../qnx-armv7le-qcc => qnx-x86-qcc}/qplatformdefs.h | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename mkspecs/{unsupported => }/blackberry-armv7le-qcc/qmake.conf (83%) rename mkspecs/{unsupported => }/blackberry-armv7le-qcc/qplatformdefs.h (100%) rename mkspecs/{unsupported => }/blackberry-x86-qcc/qmake.conf (84%) rename mkspecs/{unsupported => }/blackberry-x86-qcc/qplatformdefs.h (100%) rename mkspecs/{unsupported => }/qnx-armv7le-qcc/qmake.conf (62%) rename mkspecs/{unsupported/qnx-x86-qcc => qnx-armv7le-qcc}/qplatformdefs.h (98%) rename mkspecs/{unsupported => }/qnx-x86-qcc/qmake.conf (64%) rename mkspecs/{unsupported/qnx-armv7le-qcc => qnx-x86-qcc}/qplatformdefs.h (98%) 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 efb585b6a5..4a8cde7b16 100644 --- 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 3fd84c13a6..24bbffe920 100644 --- 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 37c66cd178..8dd84811c1 100644 --- 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-x86-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h similarity index 98% rename from mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h rename to mkspecs/qnx-armv7le-qcc/qplatformdefs.h index 8ef80c4bd7..495446ce91 100644 --- a/mkspecs/unsupported/qnx-x86-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 cf588bae1c..36a3ba2ff3 100644 --- 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-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h similarity index 98% rename from mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h rename to mkspecs/qnx-x86-qcc/qplatformdefs.h index 8ef80c4bd7..495446ce91 100644 --- a/mkspecs/unsupported/qnx-armv7le-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