uikit: refactor the mkspecs and add armv6 and nothumb ones.

Change-Id: I69ae8b40e3574039c8f9b0d88ecd55d16e830ac9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

8 files changed, 304 insertions, 98 deletions

diff --git a/mkspecs/qpa/common/g++-base-macx-iphone.conf b/mkspecs/qpa/common/g++-base-macx-iphone.conf
new file mode 100644
index 0000000000..f595deaa37
--- /dev/null
+++ b/mkspecs/qpa/common/g++-base-macx-iphone.conf
@@ -0,0 +1,47 @@
+#
+# qmake configuration base for iphone-g++
+#
+include(../../common/mac.conf)
+include(../../common/gcc-base-macx.conf)
+include(../../common/g++-macx.conf)
+
+MAKEFILE_GENERATOR      = UNIX
+TEMPLATE                = app
+CONFIG                 += qt warn_on release incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+QT                     += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+# Build everything as static libs
+CONFIG                 += static
+CONFIG                 -= app_bundle
+
+# This is Apple Darwin without the Carbon framework
+DEFINES                += DARWIN_NO_CARBON
+
+# Do not compile a few things
+DEFINES += QT_NO_AUDIO_BACKEND
+
+# You may need to change this to point to the iOS SDK you want to use.
+QMAKE_IOS_SDK_VERSION  = 5.0
+
+# Set up deployment targets
+QMAKE_IPHONEOS_DEPLOYMENT_TARGET = 4.0
+QMAKE_MACOSX_DEPLOYMENT_TARGET =
+
+QMAKE_LIBS_OPENGL_ES1  += -framework OpenGLES
+QMAKE_LIBS_OPENGL_ES2  += -framework OpenGLES
+
+# TARGET_PLATFORM = ios
+QMAKE_CFLAGS           += -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
+QMAKE_CXXFLAGS         += -fvisibility=hidden -fvisibility-inlines-hidden
+QMAKE_OBJECTIVE_CFLAGS += -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
+QMAKE_LFLAGS           += -miphoneos-version-min=4.2 -framework Foundation -framework UIKit -framework QuartzCore -lz
+
+QMAKE_INCDIR_OPENGL     =
+QMAKE_LIBS_OPENGL       =
+QMAKE_LIBS_OPENGL_QT    =
+
+#QMAKE_RESOURCE         =
+QMAKE_FIX_RPATH         = $$QMAKE_IOS_DEV_PATH/usr/bin/install_name_tool -id
+QMAKE_AR                = $$QMAKE_IOS_DEV_PATH/usr/bin/ar cq
+QMAKE_RANLIB            = $$QMAKE_IOS_DEV_PATH/usr/bin/ranlib -s
diff --git a/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf b/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
new file mode 100644
index 0000000000..49e9d4662e
--- /dev/null
+++ b/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
@@ -0,0 +1,24 @@
+#
+# qmake configuration base for iphone-device-g++
+#
+include(g++-base-macx-iphone.conf)
+
+# You may need to change this to point to the iOS SDK you want to use.
+QMAKE_IOS_DEV_PATH     = /Developer/Platforms/iPhoneOS.platform/Developer
+QMAKE_IOS_SDK          = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneOS$${QMAKE_IOS_SDK_VERSION}.sdk
+
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
+QMAKE_LIBDIR_OPENGL_ES1 =
+
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
+QMAKE_LIBDIR_OPENGL_ES2 =
+
+# TARGET_PLATFORM = ios
+QMAKE_CC                = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc
+QMAKE_CXX               = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+
+QMAKE_CFLAGS           += -isysroot $$QMAKE_IOS_SDK
+QMAKE_OBJECTIVE_CFLAGS += -isysroot $$QMAKE_IOS_SDK
+QMAKE_LFLAGS           += -Wl,-syslibroot,$$QMAKE_IOS_SDK
diff --git a/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf b/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
new file mode 100644
index 0000000000..7ffaecaa96
--- /dev/null
+++ b/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
@@ -0,0 +1,11 @@
+#
+# qmake configuration for iphone-device-g++
+#
+include(../common/g++-base-macx-iphonedevice.conf)
+
+QMAKE_CFLAGS           += -arch armv6
+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS += -arch armv6
+QMAKE_LFLAGS           += -arch armv6
+
+load(qt_config)
diff --git a/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h b/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
new file mode 100644
index 0000000000..d8777e7752
--- /dev/null
+++ b/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// 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>
+#define QT_NO_LIBRARY_UNLOAD
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.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
+
+#include "../../common/posix/qplatformdefs.h"
+
+#undef QT_OPEN_LARGEFILE
+#undef QT_SOCKLEN_T
+#undef QT_SIGNAL_IGNORE
+
+#define QT_OPEN_LARGEFILE       0
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
+#define QT_SOCKLEN_T            socklen_t
+#else
+#define QT_SOCKLEN_T            int
+#endif
+
+#define QT_SIGNAL_IGNORE        (void (*)(int))1
+
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
+
+#define QT_QPA_DEFAULT_PLATFORM_NAME "uikit"
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf b/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
new file mode 100644
index 0000000000..25542bc00e
--- /dev/null
+++ b/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
@@ -0,0 +1,11 @@
+#
+# qmake configuration for iphone-device-g++
+#
+include(../common/g++-base-macx-iphonedevice.conf)
+
+QMAKE_CFLAGS           += -arch armv7 -marm
+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS += -arch armv7 -marm
+QMAKE_LFLAGS           += -arch armv7 -marm
+
+load(qt_config)
diff --git a/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h b/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
new file mode 100644
index 0000000000..d8777e7752
--- /dev/null
+++ b/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// 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>
+#define QT_NO_LIBRARY_UNLOAD
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.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
+
+#include "../../common/posix/qplatformdefs.h"
+
+#undef QT_OPEN_LARGEFILE
+#undef QT_SOCKLEN_T
+#undef QT_SIGNAL_IGNORE
+
+#define QT_OPEN_LARGEFILE       0
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
+#define QT_SOCKLEN_T            socklen_t
+#else
+#define QT_SOCKLEN_T            int
+#endif
+
+#define QT_SIGNAL_IGNORE        (void (*)(int))1
+
+#define QT_SNPRINTF             ::snprintf
+#define QT_VSNPRINTF            ::vsnprintf
+
+#define QT_QPA_DEFAULT_PLATFORM_NAME "uikit"
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf b/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
index faec47d0eb..0fca5651df 100644
--- a/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
+++ b/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
@@ -1,61 +1,11 @@
 #
 # qmake configuration for iphone-device-g++
 #
-include(../../common/mac.conf)
-include(../../common/gcc-base-macx.conf)
-include(../../common/g++-macx.conf)
+include(../common/g++-base-macx-iphonedevice.conf)
 
-MAKEFILE_GENERATOR      = UNIX
-TEMPLATE	                = app
-CONFIG                 += qt warn_on release incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT                     += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-# Build everything as static libs
-CONFIG                 += static
-CONFIG                 -= app_bundle
-
-# This is Apple Darwin without the Carbon framework
-DEFINES                += DARWIN_NO_CARBON
-
-# Do not compile a few things
-DEFINES += QT_NO_AUDIO_BACKEND
-
-# You may need to change this to point to the iOS SDK you want to use.
-QMAKE_IOS_DEV_PATH     = /Developer/Platforms/iPhoneOS.platform/Developer
-QMAKE_IOS_SDK          = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneOS4.3.sdk
-
-# Set up deployment targets
-QMAKE_IPHONEOS_DEPLOYMENT_TARGET = 4.0
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 
-
-QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
-QMAKE_LIBDIR_OPENGL_ES1 =
-QMAKE_LIBS_OPENGL_ES1  += -framework OpenGLES
-
-QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
-QMAKE_LIBDIR_OPENGL_ES2 =
-QMAKE_LIBS_OPENGL_ES2  += -framework OpenGLES
-
-# TARGET_PLATFORM = ios
-QMAKE_CC                = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
-QMAKE_CXX               = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2
-QMAKE_LINK              = $$QMAKE_CXX
-QMAKE_LINK_SHLIB        = $$QMAKE_CXX
-
-QMAKE_CFLAGS           += -arch armv7 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
-QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_OBJECTIVE_CFLAGS += -arch armv7 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
-QMAKE_LFLAGS           += -arch armv7 -miphoneos-version-min=4.2 -Wl,-syslibroot,$$QMAKE_IOS_SDK
-QMAKE_LFLAGS           += -framework Foundation -framework UIKit -framework QuartzCore -lz
-
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBS_OPENGL       =
-QMAKE_LIBS_OPENGL_QT    =
-
-#QMAKE_RESOURCE         =
-QMAKE_FIX_RPATH         = $$QMAKE_IOS_DEV_PATH/usr/bin/install_name_tool -id
-QMAKE_AR                = $$QMAKE_IOS_DEV_PATH/usr/bin/ar cq
-QMAKE_RANLIB            = $$QMAKE_IOS_DEV_PATH/usr/bin/ranlib -s
+QMAKE_CFLAGS           += -arch armv7
+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS += -arch armv7
+QMAKE_LFLAGS           += -arch armv7
 
 load(qt_config)
diff --git a/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf b/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf
index df8d4e848d..3b5fe0a146 100644
--- a/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf
+++ b/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf
@@ -1,62 +1,27 @@
 #
 # qmake configuration for iphone-simulator-g++
 #
-include(../../common/mac.conf)
-include(../../common/gcc-base-macx.conf)
-include(../../common/g++-macx.conf)
+include(../common/g++-base-macx-iphone.conf)
 
-MAKEFILE_GENERATOR      = UNIX
-TEMPLATE                = app
-CONFIG                 += qt warn_on release incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT                     += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-# Build everything as static libs
-CONFIG                 += static
-CONFIG                 -= app_bundle
-
-# This is Apple Darwin without the Carbon framework
-DEFINES                += DARWIN_NO_CARBON
-
-# Do not compile a few things
-DEFINES += QT_NO_AUDIO_BACKEND
-
-# You may need to change this to point to the iOS SDK you want to use.
 QMAKE_IOS_DEV_PATH      = /Developer/Platforms/iPhoneSimulator.platform/Developer
-QMAKE_IOS_SDK           = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneSimulator4.3.sdk
-
-# Set up deployment targets
-QMAKE_IPHONEOS_DEPLOYMENT_TARGET = 4.0
-QMAKE_MACOSX_DEPLOYMENT_TARGET =
+QMAKE_IOS_SDK           = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneSimulator$${QMAKE_IOS_SDK_VERSION}.sdk
 
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
 QMAKE_LIBDIR_OPENGL_ES1 =
-QMAKE_LIBS_OPENGL_ES1  += -framework OpenGLES
 
 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
 QMAKE_LIBDIR_OPENGL_ES2 =
-QMAKE_LIBS_OPENGL_ES2  += -framework OpenGLES
 
 # TARGET_PLATFORM = ios
-QMAKE_CC                = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2
-QMAKE_CXX               = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2
+QMAKE_CC                = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc
+QMAKE_CXX               = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
 
-QMAKE_CFLAGS           += -arch i386 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
-QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_OBJECTIVE_CFLAGS += -arch i386 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2 -fobjc-abi-version=2 -fobjc-legacy-dispatch
-QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2 -fobjc-abi-version=2 -fobjc-legacy-dispatch
+QMAKE_CFLAGS           += -arch i386 -isysroot $$QMAKE_IOS_SDK
+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS += -arch i386 -isysroot $$QMAKE_IOS_SDK -fobjc-abi-version=2 -fobjc-legacy-dispatch
+QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386 -isysroot $$QMAKE_IOS_SDK -fobjc-abi-version=2 -fobjc-legacy-dispatch
 QMAKE_LFLAGS           += -arch i386 -Wl,-syslibroot,$$QMAKE_IOS_SDK
-QMAKE_LFLAGS           += -framework Foundation -framework UIKit -framework QuartzCore -lz
-
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBS_OPENGL       =
-QMAKE_LIBS_OPENGL_QT    =
-
-#QMAKE_RESOURCE         =
-QMAKE_FIX_RPATH         = $$QMAKE_IOS_DEV_PATH/usr/bin/install_name_tool -id
-QMAKE_AR                = $$QMAKE_IOS_DEV_PATH/usr/bin/ar cq
-QMAKE_RANLIB            = $$QMAKE_IOS_DEV_PATH/usr/bin/ranlib -s
 
 load(qt_config)