summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mkspecs/blackberry-armv7le-qcc/qmake.conf (renamed from mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf)0
-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)0
-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)6
-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)6
-rw-r--r--mkspecs/qnx-x86-qcc/qplatformdefs.h (renamed from mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h)2
8 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf
index 4e72667c5d..4e72667c5d 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
index 657cb56e5e..657cb56e5e 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 60b67f801e..60b67f801e 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/blackberry-x86-qcc/qmake.conf
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/blackberry-x86-qcc/qplatformdefs.h
index 4d198c37c8..4d198c37c8 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 de0d5db290..c80d84474b 100644
--- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+++ b/mkspecs/qnx-armv7le-qcc/qmake.conf
@@ -8,14 +8,14 @@ TEMPLATE = app
CONFIG += qt warn_on release link_prl qnx
QT += core gui
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
QMAKE_CC = qcc -Vgcc_ntoarmv7le
QMAKE_CXX = qcc -Vgcc_ntoarmv7le
QNX_CPUDIR = armle-v7
-include(../../common/qcc-base-qnx.conf)
+include(../common/qcc-base-qnx.conf)
QMAKE_AR = ntoarmv7-ar cqs
QMAKE_OBJCOPY = ntoarmv7-objcopy
diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
index 8aaca4402b..91945a0a22 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 55584c29eb..48dcde8787 100644
--- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+++ b/mkspecs/qnx-x86-qcc/qmake.conf
@@ -8,14 +8,14 @@ TEMPLATE = app
CONFIG += qt warn_on release link_prl qnx
QT += core gui
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
QMAKE_CC = qcc -Vgcc_ntox86
QMAKE_CXX = qcc -Vgcc_ntox86
QNX_CPUDIR = x86
-include(../../common/qcc-base-qnx.conf)
+include(../common/qcc-base-qnx.conf)
QMAKE_AR = ntox86-ar cqs
QMAKE_OBJCOPY = ntox86-objcopy
diff --git a/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h
index 8aaca4402b..91945a0a22 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