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>

7 files changed, 11 insertions, 341 deletions

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
deleted file mode 100644
index 803b2da..0000000
--- 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/integrity-ghs/qplatformdefs.h b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
deleted file mode 100644
index 107535c..0000000
--- a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+++ /dev/null
@@ -1,202 +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 QtGui module 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$
-**
-****************************************************************************/
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-#include <limits.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct stat64
-#define QT_STATBUF4TSTAT        struct stat64
-#define QT_STAT                 ::stat64
-#define QT_FSTAT                ::fstat64
-#define QT_LSTAT                ::lstat64
-#define QT_OPEN                 ::open64
-#define QT_TRUNCATE             ::truncate64
-#define QT_FTRUNCATE            ::ftruncate64
-#define QT_LSEEK                ::lseek64
-#else
-#define QT_STATBUF              struct stat
-#define QT_STATBUF4TSTAT        struct stat
-#define QT_STAT                 ::stat
-#define QT_FSTAT                ::fstat
-#define QT_LSTAT                ::lstat
-#define QT_OPEN                 ::open
-#define QT_TRUNCATE             ::truncate
-#define QT_FTRUNCATE            ::ftruncate
-#define QT_LSEEK                ::lseek
-#define QT_OPEN_LARGEFILE       0
-#endif
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN                ::fopen64
-#define QT_FSEEK                ::fseeko64
-#define QT_FTELL                ::ftello64
-#define QT_FGETPOS              ::fgetpos64
-#define QT_FSETPOS              ::fsetpos64
-#define QT_FPOS_T               fpos64_t
-#define QT_OFF_T                off64_t
-#else
-#define QT_FOPEN                ::fopen
-#define QT_FSEEK                ::fseek
-#define QT_FTELL                ::ftell
-#define QT_FGETPOS              ::fgetpos
-#define QT_FSETPOS              ::fsetpos
-#define QT_FPOS_T               fpos_t
-#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
-#ifndef QT_CLOSE
-#define QT_CLOSE		::close
-#endif
-#ifndef QT_READ
-#define QT_READ			::read
-#endif
-#ifndef QT_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_MMAP                 ::mmap
-
-// Directory iteration
-#define QT_DIR                  DIR
-
-#define QT_OPENDIR              ::opendir
-#define QT_CLOSEDIR             ::closedir
-
-
-#if defined(QT_LARGEFILE_SUPPORT) \
-        && defined(QT_USE_XOPEN_LFS_EXTENSIONS) \
-        && !defined(QT_NO_READDIR64)
-# define QT_DIRENT               struct dirent64
-# define QT_READDIR              ::readdir64
-# define QT_READDIR_R            ::readdir64_r
-#else
-# define QT_DIRENT               struct dirent
-# define QT_READDIR              ::readdir
-# define QT_READDIR_R            ::readdir_r
-#endif
-
-#define QT_SOCKLEN_T           socklen_t
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
-#endif
-
-#ifndef MAXNAMLEN
-#  define MAXNAMLEN NAME_MAX
-#endif
-
-#ifndef PATH_MAX
-#  define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef NSIG
-#  define NSIG _SIGMAX
-#endif
-
-#ifndef MAP_ANON
-#  define MAP_ANON 0
-#endif
-
-typedef void (*sighandler_t)(int);
-
-#ifndef QT_NO_MMAP
-#  define QT_NO_MMAP
-#endif
-
-#ifndef QT_NO_SHAREDMEMORY
-#  define QT_NO_SHAREDMEMORY
-#endif
-
-#ifndef QT_NO_SYSTEMSEMAPHORE
-#  define QT_NO_SYSTEMSEMAPHORE
-#endif
-
diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf b/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf
deleted file mode 100644
index acaf3c2..0000000
--- a/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# qmake configuration for integrity-ghs
-#
-
-INTEGRITY_DIR		= /enter/your/path/to/INTEGRITY
-INTEGRITY_BSP		= enter_your_bsp_name_here
-QMAKE_CC		= ccintarm
-QMAKE_CXX		= cxintarm
-QMAKE_LINK		= cxintarm
-QMAKE_LINK_SHLIB	= cxintarm
-include(../../integrity-ghs/qmake.conf)
-
diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h b/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h
deleted file mode 100644
index 71ddfd7..0000000
--- a/mkspecs/unsupported/qws/integrity-arm-cxarm/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 "../../integrity-ghs/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf b/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf
deleted file mode 100644
index 829e6d3..0000000
--- a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# qmake configuration for integrity-ghs
-#
-
-INTEGRITY_DIR		= /enter/your/path/to/INTEGRITY
-INTEGRITY_BSP		= enter_your_bsp_name_here
-QMAKE_CC		= ccintppc
-QMAKE_CXX		= cxintppc
-QMAKE_LINK		= cxintppc
-QMAKE_LINK_SHLIB	= cxintppc
-include(../../integrity-ghs/qmake.conf)
-
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 0000000..513ede5
--- /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-ppc-cxppc/qplatformdefs.h b/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
index 71ddfd7..71ddfd7 100644
--- a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h