11 files changed, 51 insertions, 51 deletions
diff --git a/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf b/mkspecs/qws/qnx-arm-g++/qmake.conf
index b9f946e..881ca0f 100644
--- a/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf
+++ b/mkspecs/qws/qnx-arm-g++/qmake.conf
@@ -4,7 +4,7 @@
 # Written for QNX RTOS v6
 #
 
-include(../../../common/qnx/qmake.conf)
+include(../../common/qnx/qmake.conf)
 
 # modifications to gcc-base.conf and g++-base.conf
 
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h b/mkspecs/qws/qnx-arm-g++/qplatformdefs.h
index 1f5dadd..e848982 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/qnx-arm-g++/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../../common/qnx/qplatformdefs.h"
+#include "../../common/qnx/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf b/mkspecs/qws/qnx-armv7-g++/qmake.conf
index c6763d5..f840ab9 100644
--- a/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf
+++ b/mkspecs/qws/qnx-armv7-g++/qmake.conf
@@ -4,7 +4,7 @@
 # Written for QNX RTOS v6
 #
 
-include(../../../common/qnx/qmake.conf)
+include(../../common/qnx/qmake.conf)
 
 # modifications to gcc-base.conf and g++-base.conf
 
diff --git a/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h b/mkspecs/qws/qnx-armv7-g++/qplatformdefs.h
index 1f5dadd..e848982 100644
--- a/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h
+++ b/mkspecs/qws/qnx-armv7-g++/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../../common/qnx/qplatformdefs.h"
+#include "../../common/qnx/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/qws/qnx-generic-g++/qmake.conf
index f5e7045..085aae7 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/qws/qnx-generic-g++/qmake.conf
@@ -4,7 +4,7 @@
 # Written for QNX RTOS v6
 #
 
-include(../../../common/qnx/qmake.conf)
+include(../../common/qnx/qmake.conf)
 
 # derived from g++-base.conf
 #QMAKE_CC               = gcc
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h b/mkspecs/qws/qnx-generic-g++/qplatformdefs.h
index 1f5dadd..e848982 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
+++ b/mkspecs/qws/qnx-generic-g++/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../../common/qnx/qplatformdefs.h"
+#include "../../common/qnx/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/qws/qnx-i386-g++/qmake.conf
index 6940bd8..40edc91 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/qws/qnx-i386-g++/qmake.conf
@@ -4,7 +4,7 @@
 # Written for QNX RTOS v6
 #
 
-include(../../../common/qnx/qmake.conf)
+include(../../common/qnx/qmake.conf)
 
 # modifications to g++-base.conf
 QMAKE_CC               = ntox86-gcc
diff --git a/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h b/mkspecs/qws/qnx-i386-g++/qplatformdefs.h
index 1f5dadd..e848982 100644
--- a/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h
+++ b/mkspecs/qws/qnx-i386-g++/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../../common/qnx/qplatformdefs.h"
+#include "../../common/qnx/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/qws/qnx-ppc-g++/qmake.conf
index cb4d391..186206f 100644
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/qws/qnx-ppc-g++/qmake.conf
@@ -4,7 +4,7 @@
 # Written for QNX RTOS v6
 #
 
-include(../../../common/qnx/qmake.conf)
+include(../../common/qnx/qmake.conf)
 
 # modifications to g++-base.conf
 QMAKE_CC               = ntoppc-gcc
diff --git a/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h b/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h
new file mode 100644
index 0000000..e848982
--- /dev/null
+++ b/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/qnx/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
deleted file mode 100644
index 1f5dadd..0000000
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../../common/qnx/qplatformdefs.h"