diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-09-04 10:42:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-04 18:17:23 +0200 |
| commit | 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2 (patch) | |
| tree | aee15a552f84f7d290c73e64bd5f06b3d06d01b8 /mkspecs | |
| parent | f8f78a4f6f7c07c3e6c1ff93d589443459913475 (diff) | |
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qmake.conf (renamed from mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf) | 2 | ||||
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h) | 0 | ||||
| -rw-r--r-- | mkspecs/blackberry-x86-qcc/qmake.conf (renamed from mkspecs/unsupported/blackberry-x86-qcc/qmake.conf) | 2 | ||||
| -rw-r--r-- | mkspecs/blackberry-x86-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h) | 0 | ||||
| -rw-r--r-- | mkspecs/qnx-armv7le-qcc/qmake.conf (renamed from mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf) | 2 | ||||
| -rw-r--r-- | mkspecs/qnx-armv7le-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h) | 2 | ||||
| -rw-r--r-- | mkspecs/qnx-x86-qcc/qmake.conf (renamed from mkspecs/unsupported/qnx-x86-qcc/qmake.conf) | 2 | ||||
| -rw-r--r-- | mkspecs/qnx-x86-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h) | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/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 index 964c34bb99..964c34bb99 100644 --- a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h +++ b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/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 index f134e76665..f134e76665 100644 --- a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h +++ b/mkspecs/blackberry-x86-qcc/qplatformdefs.h diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/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-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h index 8ef80c4bd7..495446ce91 100644 --- 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 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-x86-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h index 8ef80c4bd7..495446ce91 100644 --- 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 |