INTEGRITY mkspecs update

Modifies existing structure of INTEGRITY mkspecs to be more clear and
adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs
to supported folder as this is the case in 4.8.x.

Task-number: QTBUG-24153
Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

11 files changed, 209 insertions, 105 deletions

diff --git a/mkspecs/common/ghs-base-integrity.conf b/mkspecs/common/ghs-base-integrity.conf
new file mode 100644
index 0000000000..d8ac7e31ee
--- /dev/null
+++ b/mkspecs/common/ghs-base-integrity.conf
@@ -0,0 +1,71 @@
+#
+# Base qmake configuration for integrity-ghs
+#
+
+MAKEFILE_GENERATOR      = GBUILD
+TEMPLATE                = app
+CONFIG                  += qt warn_on release integrity unix
+QT                      += core gui network
+DEFINES                 += QT_NO_SHAREDMEMORY QT_NO_PROCESS QT_NO_QWS_MULTIPROCESS QT_NO_SYSTEMSEMAPHORE QT_NO_PRINTER QT_NO_QWS_QPF2
+
+QMAKE_CFLAGS            = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR
+QMAKE_CFLAGS            += --diag_suppress=1,228,236,381,611,997,1795
+QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -g -Ospeed -Olink --signed_fields --no_commons
+QMAKE_CFLAGS_DEBUG      = -g --no_commons --signed_fields
+QMAKE_CFLAGS_SHLIB      =
+QMAKE_CFLAGS_THREAD     = -D_REENTRANT
+
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        =
+QMAKE_LIBDIR_X11        =
+QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL     =
+QMAKE_LIBDIR_OPENGL     =
+QMAKE_INCDIR_QTOPIA     = $(QPEDIR)/include
+QMAKE_LIBDIR_QTOPIA     = $(QPEDIR)/lib
+
+QMAKE_LFLAGS            = -lposix -livfs -lnet -lsocket -lfbdev -lhiddev -ldl
+QMAKE_LFLAGS_RELEASE    = -g -Ospeed -Olink --no_commons -non_shared --link_once_templates
+QMAKE_LFLAGS_DEBUG      = -g --no_commons -non_shared --link_once_templates
+QMAKE_LFLAGS_SHLIB      =
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     =
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_RPATH      =
+
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11          =
+QMAKE_LIBS_X11SM        =
+QMAKE_LIBS_QTOPIA       =
+QMAKE_LIBS_THREAD       =
+
+QMAKE_MOC               = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC               = $$[QT_INSTALL_BINS]/uic
+
+QMAKE_AR                = ar cqs
+QMAKE_RANLIB            =
+
+QMAKE_TAR               = tar -cf
+QMAKE_GZIP              = gzip -9f
+
+QMAKE_COPY              = cp -f
+QMAKE_MOVE              = mv -f
+QMAKE_DEL_FILE          = rm -f
+QMAKE_DEL_DIR           = rmdir
+QMAKE_CHK_DIR_EXISTS    = test -d
+QMAKE_MKDIR             = mkdir -p
+load(qt_config)
diff --git a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h b/mkspecs/common/integrity/qplatformdefs.h
index 107535c6a3..4ec22cb37a 100644
--- a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+++ b/mkspecs/common/integrity/qplatformdefs.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -110,37 +110,37 @@
 #define QT_OFF_T                long
 #endif
 
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_SOCKET_CONNECT	::connect
-#define QT_SOCKET_BIND		::bind
-#define QT_FILENO		fileno
+#define QT_STAT_REG             S_IFREG
+#define QT_STAT_DIR             S_IFDIR
+#define QT_STAT_MASK            S_IFMT
+#define QT_STAT_LNK             S_IFLNK
+#define QT_SOCKET_CONNECT       ::connect
+#define QT_SOCKET_BIND          ::bind
+#define QT_FILENO               fileno
 #ifndef QT_CLOSE
-#define QT_CLOSE		::close
+#define QT_CLOSE                ::close
 #endif
 #ifndef QT_READ
-#define QT_READ			::read
+#define QT_READ                 ::read
 #endif
 #ifndef QT_WRITE
-#define QT_WRITE		::write
+#define QT_WRITE                ::write
 #endif
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
+#define QT_ACCESS               ::access
+#define QT_GETCWD               ::getcwd
+#define QT_CHDIR                ::chdir
+#define QT_MKDIR                ::mkdir
+#define QT_RMDIR                ::rmdir
+#define QT_OPEN_RDONLY          O_RDONLY
+#define QT_OPEN_WRONLY          O_WRONLY
+#define QT_OPEN_RDWR            O_RDWR
+#define QT_OPEN_CREAT           O_CREAT
+#define QT_OPEN_TRUNC           O_TRUNC
+#define QT_OPEN_APPEND          O_APPEND
+
+#define QT_SIGNAL_RETTYPE       void
+#define QT_SIGNAL_ARGS          int
+#define QT_SIGNAL_IGNORE        SIG_IGN
 
 #define QT_MMAP                 ::mmap
 
@@ -166,8 +166,8 @@
 #define QT_SOCKLEN_T           socklen_t
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
 #endif
 
 #ifndef MAXNAMLEN
@@ -199,4 +199,3 @@ typedef void (*sighandler_t)(int);
 #ifndef QT_NO_SYSTEMSEMAPHORE
 #  define QT_NO_SYSTEMSEMAPHORE
 #endif
-
diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf b/mkspecs/qws/integrity-arm-cxarm/qmake.conf
index acaf3c29e8..a4507bc1d1 100644
--- a/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf
+++ b/mkspecs/qws/integrity-arm-cxarm/qmake.conf
@@ -8,5 +8,5 @@ QMAKE_CC		= ccintarm
 QMAKE_CXX		= cxintarm
 QMAKE_LINK		= cxintarm
 QMAKE_LINK_SHLIB	= cxintarm
-include(../../integrity-ghs/qmake.conf)
+include(../../common/ghs-base-integrity.conf)
 
diff --git a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h b/mkspecs/qws/integrity-arm-cxarm/qplatformdefs.h
index 71ddfd7460..4f24712542 100644
--- a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h
+++ b/mkspecs/qws/integrity-arm-cxarm/qplatformdefs.h
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "../../integrity-ghs/qplatformdefs.h"
+#include "../../common/integrity/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf b/mkspecs/qws/integrity-ppc-cxppc/qmake.conf
index 829e6d3b3a..7e3c05c202 100644
--- a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf
+++ b/mkspecs/qws/integrity-ppc-cxppc/qmake.conf
@@ -8,5 +8,5 @@ QMAKE_CC		= ccintppc
 QMAKE_CXX		= cxintppc
 QMAKE_LINK		= cxintppc
 QMAKE_LINK_SHLIB	= cxintppc
-include(../../integrity-ghs/qmake.conf)
+include(../../common/ghs-base-integrity.conf)
 
diff --git a/mkspecs/qws/integrity-ppc-cxppc/qplatformdefs.h b/mkspecs/qws/integrity-ppc-cxppc/qplatformdefs.h
new file mode 100644
index 0000000000..4f24712542
--- /dev/null
+++ b/mkspecs/qws/integrity-ppc-cxppc/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/integrity/qplatformdefs.h"
diff --git a/mkspecs/qws/integrity-x86-cx86/qmake.conf b/mkspecs/qws/integrity-x86-cx86/qmake.conf
new file mode 100644
index 0000000000..b7de73beed
--- /dev/null
+++ b/mkspecs/qws/integrity-x86-cx86/qmake.conf
@@ -0,0 +1,12 @@
+#
+# qmake configuration for integrity-ghs
+#
+
+INTEGRITY_DIR           = /enter/your/path/to/INTEGRITY
+INTEGRITY_BSP           = enter_your_bsp_name_here
+QMAKE_CC                = ccint86
+QMAKE_CXX               = cxint86
+QMAKE_LINK              = cxint86
+QMAKE_LINK_SHLIB        = cxint86
+include(../../common/ghs-base-integrity.conf)
+
diff --git a/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h b/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h
new file mode 100644
index 0000000000..4f24712542
--- /dev/null
+++ b/mkspecs/qws/integrity-x86-cx86/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/integrity/qplatformdefs.h"
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
deleted file mode 100644
index 803b2da7f1..0000000000
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# qmake configuration for integrity-ghs
-#
-
-MAKEFILE_GENERATOR	= GBUILD
-#MAKEFILE_GENERATOR	= UNIX
-TEMPLATE		= app
-CONFIG			+= qt warn_on release integrity unix
-QT                      += core gui network
-DEFINES                 += QT_NO_SHAREDMEMORY QT_NO_PROCESS QT_NO_QWS_MULTIPROCESS QT_NO_SYSTEMSEMAPHORE QT_NO_PRINTER QT_NO_QWS_QPF2
-
-QMAKE_CFLAGS            = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR
-QMAKE_CFLAGS            += --diag_suppress=1,228,236,381,611,997,1795
-QMAKE_CFLAGS_WARN_ON	=
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -g -Ospeed -Olink --signed_fields --no_commons
-QMAKE_CFLAGS_DEBUG	= -g --no_commons --signed_fields
-QMAKE_CFLAGS_SHLIB	=
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
-
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	=
-QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL	=
-QMAKE_LIBDIR_OPENGL	=
-QMAKE_INCDIR_QTOPIA	= $(QPEDIR)/include
-QMAKE_LIBDIR_QTOPIA	= $(QPEDIR)/lib
-
-QMAKE_LFLAGS            = -lposix -livfs -lnet -lsocket -lfbdev -lhiddev -ldl
-QMAKE_LFLAGS_RELEASE	= -g -Ospeed -Olink --no_commons -non_shared --link_once_templates
-QMAKE_LFLAGS_DEBUG      = -g --no_commons -non_shared --link_once_templates
-QMAKE_LFLAGS_SHLIB      =
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     =
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_RPATH      =
-
-QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11		=
-QMAKE_LIBS_X11SM	=
-QMAKE_LIBS_QTOPIA	=
-QMAKE_LIBS_THREAD       =
-
-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
-
-QMAKE_AR		= ar cqs
-QMAKE_RANLIB		=
-
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
-load(qt_config)
-
diff --git a/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf b/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
new file mode 100644
index 0000000000..513ede5a0b
--- /dev/null
+++ b/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
@@ -0,0 +1,11 @@
+#
+# qmake configuration for integrity-ghs
+#
+
+INTEGRITY_DIR           = /enter/your/path/to/INTEGRITY
+INTEGRITY_BSP           = enter_your_bsp_name_here
+QMAKE_CC                = ccint86
+QMAKE_CXX               = cxint86
+QMAKE_LINK              = cxint86
+QMAKE_LINK_SHLIB        = cxint86
+include(../../integrity-ghs/qmake.conf)
diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h b/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
index 71ddfd7460..71ddfd7460 100644
--- a/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h