diff --git a/tools/mkspecs/common/mac-clang.conf b/tools/mkspecs/common/mac-clang.conf
new file mode 100644
index 0000000000..eb94b4806a
--- /dev/null
+++ b/tools/mkspecs/common/mac-clang.conf
@@ -0,0 +1,18 @@
+#
+# qmake configuration for common clang on Mac OS X
+#
+
+include(mac.conf)
+
+QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
+QMAKE_CC = clang
+QMAKE_CFLAGS += -pipe
+QMAKE_CFLAGS_RELEASE += -O4 -flto
+QMAKE_CFLAGS_DEBUG += -O0 -g
+
+QMAKE_CXX = clang++
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+
+QMAKE_LINK = $$QMAKE_CXX
diff --git a/tools/mkspecs/common/mac.conf b/tools/mkspecs/common/mac.conf
new file mode 100644
index 0000000000..cbc7f6cd46
--- /dev/null
+++ b/tools/mkspecs/common/mac.conf
@@ -0,0 +1,44 @@
+#
+# qmake configuration for common Mac OS X
+#
+
+QMAKE_RESOURCE = /Developer/Tools/Rez
+
+QMAKE_EXTENSION_SHLIB = dylib
+
+QMAKE_LIBDIR =
+QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
+ /System/Library/Frameworks/AGL.framework/Headers/
+
+QMAKE_FIX_RPATH = install_name_tool -id
+
+QMAKE_LFLAGS_RPATH =
+
+QMAKE_LIBS_DYNLOAD =
+QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
+QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL
+QMAKE_LIBS_THREAD =
+
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+
+QMAKE_AR = ar cq
+QMAKE_RANLIB = ranlib -s
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_COPY_FILE = $$QMAKE_COPY
+QMAKE_COPY_DIR = $$QMAKE_COPY -R
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+QMAKE_CHK_DIR_EXISTS = test -d
+QMAKE_MKDIR = mkdir -p
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 # overridden to 10.5 for Cocoa on the compiler command line
+
+
+include(unix.conf)
diff --git a/tools/mkspecs/common/unix.conf b/tools/mkspecs/common/unix.conf
new file mode 100644
index 0000000000..c480ba4407
--- /dev/null
+++ b/tools/mkspecs/common/unix.conf
@@ -0,0 +1,14 @@
+#
+# qmake configuration for common unix
+#
+
+QMAKE_LEX = flex
+QMAKE_LEXFLAGS +=
+QMAKE_YACC = yacc
+QMAKE_YACCFLAGS += -d
+QMAKE_YACCFLAGS_MANGLE += -p $base -b $base
+QMAKE_YACC_HEADER = $base.tab.h
+QMAKE_YACC_SOURCE = $base.tab.c
+QMAKE_PREFIX_SHLIB = lib
+QMAKE_PREFIX_STATICLIB = lib
+QMAKE_EXTENSION_STATICLIB = a
diff --git a/tools/mkspecs/iphonedevice-clang/Info.plist.lib b/tools/mkspecs/iphonedevice-clang/Info.plist.lib
new file mode 100644
index 0000000000..97609ed0ce
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-clang/Info.plist.lib
@@ -0,0 +1,18 @@
+
+
+
+
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ @SHORT_VERSION@
+ CFBundleGetInfoString
+ Created by Qt/QMake
+ CFBundleSignature
+ @TYPEINFO@
+ CFBundleExecutable
+ @LIBRARY@
+ NOTE
+ Please, do NOT change this file -- It was generated by Qt/QMake.
+
+
diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf
new file mode 100644
index 0000000000..83f466814e
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-clang/qmake.conf
@@ -0,0 +1,132 @@
+#
+# qmake configuration for iphone device
+#
+
+# Don't forget to set PATH in QT creator project environment
+# to include /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
+# where gcc an all tools are actually resides
+
+IPHONE_SDK_PATH = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+
+MAKEFILE_GENERATOR = UNIX
+TEMPLATE = app
+CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC = clang -arch armv6 -arch armv7
+QMAKE_CXX = clang++ -arch armv6 -arch armv7
+
+QMAKE_RESOURCE =
+
+QMAKE_EXTENSION_SHLIB = dylib
+
+QMAKE_LIBDIR =
+QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL =
+
+QMAKE_FIX_RPATH = install_name_tool -id
+
+QMAKE_LIBS_DYNLOAD =
+QMAKE_LIBS_OPENGL =
+QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL
+QMAKE_LIBS_THREAD =
+
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+
+#QMAKE_AR = ar cq
+QMAKE_AR = libtool -static -syslibroot $$IPHONE_SDK_PATH -o
+#QMAKE_RANLIB = ranlib -s
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_COPY_FILE = $$QMAKE_COPY
+QMAKE_COPY_DIR = $$QMAKE_COPY -R
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+QMAKE_CHK_DIR_EXISTS = test -d
+QMAKE_MKDIR = mkdir -p
+
+QMAKE_PREFIX_SHLIB = lib
+QMAKE_PREFIX_STATICLIB = lib
+QMAKE_EXTENSION_STATICLIB = a
+
+QMAKE_COMPILER_DEFINES += __GNUC__
+DEFINES +=
+#QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH
+#QMAKE_CFLAGS += -I$$IPHONE_SDK_PATH/usr/include
+QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH
+QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include
+QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH
+#QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/
+QMAKE_CFLAGS += -fmessage-length=0 -marm
+QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0
+QMAKE_CFLAGS_DEPS += -M
+QMAKE_CFLAGS_WARN_ON += -Wall -W
+QMAKE_CFLAGS_WARN_OFF += -w
+QMAKE_CFLAGS_RELEASE += -O4
+QMAKE_CFLAGS_DEBUG += -g
+QMAKE_CFLAGS_SHLIB +=
+QMAKE_CFLAGS_STATIC_LIB +=
+QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CFLAGS_X86 += -arch i386
+QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
+QMAKE_CFLAGS_DWARF2 += -gdwarf-2
+
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
+
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+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_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PPC += -arch ppc
+QMAKE_CXXFLAGS_X86 += -arch i386
+QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_INCDIR_EGL += $$IPHONE_SDK_PATH/System/Library/Frameworks/OpenGLES.framework
+
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK_C = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LFLAGS += -miphoneos-version-min=4.0 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH"
+QMAKE_LFLAGS_RELEASE +=
+QMAKE_LFLAGS_DEBUG +=
+QMAKE_LFLAGS_APP +=
+QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib
+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_THREAD +=
+QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace
+QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_PPC += -arch ppc
+QMAKE_LFLAGS_X86 += -arch i386
+QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
+# -all_load requred to make Objective-C categories work in static builds.
+QMAKE_LFLAGS_STATIC_LIB += -all_load
+
+QMAKE_PCH_OUTPUT_EXT = .gch
+
+QMAKE_OBJCFLAGS_PRECOMPILE += -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_OBJCXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+load(qt_config)
diff --git a/tools/mkspecs/iphonedevice-clang/qplatformdefs.h b/tools/mkspecs/iphonedevice-clang/qplatformdefs.h
new file mode 100644
index 0000000000..1573958912
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-clang/qplatformdefs.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $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
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+#define QT_NO_LIBRARY_UNLOAD
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#ifndef QT_NO_IPV6IFNAME
+#include
+#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
+
+#endif // QPLATFORMDEFS_H
diff --git a/tools/mkspecs/iphonedevice-llvm/Info.plist.lib b/tools/mkspecs/iphonedevice-llvm/Info.plist.lib
new file mode 100644
index 0000000000..97609ed0ce
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-llvm/Info.plist.lib
@@ -0,0 +1,18 @@
+
+
+
+
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ @SHORT_VERSION@
+ CFBundleGetInfoString
+ Created by Qt/QMake
+ CFBundleSignature
+ @TYPEINFO@
+ CFBundleExecutable
+ @LIBRARY@
+ NOTE
+ Please, do NOT change this file -- It was generated by Qt/QMake.
+
+
diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf
new file mode 100644
index 0000000000..057afcb470
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf
@@ -0,0 +1,132 @@
+#
+# qmake configuration for iphone device
+#
+
+# Don't forget to set PATH in QT creator project environment
+# to include /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
+# where gcc an all tools are actually resides
+
+IPHONE_SDK_PATH = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+
+MAKEFILE_GENERATOR = UNIX
+TEMPLATE = app
+CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC = llvm-gcc -std=c99 -arch armv6 -mno-thumb
+QMAKE_CXX = llvm-g++ -arch armv6 -mno-thumb
+
+QMAKE_RESOURCE =
+
+QMAKE_EXTENSION_SHLIB = dylib
+
+QMAKE_LIBDIR =
+QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL =
+
+QMAKE_FIX_RPATH = install_name_tool -id
+
+QMAKE_LIBS_DYNLOAD =
+QMAKE_LIBS_OPENGL =
+QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL
+QMAKE_LIBS_THREAD =
+
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+
+#QMAKE_AR = ar cq
+QMAKE_AR = libtool -static -syslibroot $$IPHONE_SDK_PATH -o
+#QMAKE_RANLIB = ranlib -s
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_COPY_FILE = $$QMAKE_COPY
+QMAKE_COPY_DIR = $$QMAKE_COPY -R
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+QMAKE_CHK_DIR_EXISTS = test -d
+QMAKE_MKDIR = mkdir -p
+
+QMAKE_PREFIX_SHLIB = lib
+QMAKE_PREFIX_STATICLIB = lib
+QMAKE_EXTENSION_STATICLIB = a
+
+QMAKE_COMPILER_DEFINES += __GNUC__
+DEFINES +=
+#QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH
+#QMAKE_CFLAGS += -I$$IPHONE_SDK_PATH/usr/include
+QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH
+QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include
+QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH
+#QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/
+QMAKE_CFLAGS += -fmessage-length=0 -marm
+QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip
+QMAKE_CFLAGS_DEPS += -M
+QMAKE_CFLAGS_WARN_ON += -Wall -W
+QMAKE_CFLAGS_WARN_OFF += -w
+QMAKE_CFLAGS_RELEASE += -O3
+QMAKE_CFLAGS_DEBUG += -g
+QMAKE_CFLAGS_SHLIB +=
+QMAKE_CFLAGS_STATIC_LIB +=
+QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CFLAGS_X86 += -arch i386
+QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
+QMAKE_CFLAGS_DWARF2 += -gdwarf-2
+
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
+
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+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_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PPC += -arch ppc
+QMAKE_CXXFLAGS_X86 += -arch i386
+QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_INCDIR_EGL += $$IPHONE_SDK_PATH/System/Library/Frameworks/OpenGLES.framework
+
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK_C = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++
+QMAKE_LFLAGS_RELEASE +=
+QMAKE_LFLAGS_DEBUG +=
+QMAKE_LFLAGS_APP +=
+QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib
+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_THREAD +=
+QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace
+QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_PPC += -arch ppc
+QMAKE_LFLAGS_X86 += -arch i386
+QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
+# -all_load requred to make Objective-C categories work in static builds.
+QMAKE_LFLAGS_STATIC_LIB += -all_load
+
+QMAKE_PCH_OUTPUT_EXT = .gch
+
+QMAKE_OBJCFLAGS_PRECOMPILE += -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_OBJCXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+load(qt_config)
diff --git a/tools/mkspecs/iphonedevice-llvm/qplatformdefs.h b/tools/mkspecs/iphonedevice-llvm/qplatformdefs.h
new file mode 100644
index 0000000000..1573958912
--- /dev/null
+++ b/tools/mkspecs/iphonedevice-llvm/qplatformdefs.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $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
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+#define QT_NO_LIBRARY_UNLOAD
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#ifndef QT_NO_IPV6IFNAME
+#include
+#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
+
+#endif // QPLATFORMDEFS_H
diff --git a/tools/mkspecs/iphonesim-clang/qmake.conf b/tools/mkspecs/iphonesim-clang/qmake.conf
new file mode 100644
index 0000000000..3d2822fb1c
--- /dev/null
+++ b/tools/mkspecs/iphonesim-clang/qmake.conf
@@ -0,0 +1,18 @@
+# qt mkspec for iOS
+
+# by default clang compiler is used, add CONFIG+=gcc to override
+# by default produces device build, add CONFIG+=simulator to override
+
+MAKEFILE_GENERATOR = UNIX
+
+QMAKE_CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -ffast-math -D__IPHONE_OS_VERSION_MIN_REQUIRED=40000
+QMAKE_CFLAGS += -arch i386
+QMAKE_LFLAGS += -arch i386
+
+QMAKE_CFLAGS += -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+QMAKE_CFLAGS += -objc_abi_version=2
+QMAKE_LFLAGS += -fobjc-direct-dispatch
+
+include(../common/mac-clang.conf)
+
+#load(qt_config)
diff --git a/tools/mkspecs/macx-clang/Info.plist.app b/tools/mkspecs/macx-clang/Info.plist.app
new file mode 100644
index 0000000000..393b615475
--- /dev/null
+++ b/tools/mkspecs/macx-clang/Info.plist.app
@@ -0,0 +1,20 @@
+
+
+
+
+ CFBundleIconFile
+ @ICON@
+ CFBundlePackageType
+ APPL
+ CFBundleGetInfoString
+ Created by Qt/QMake
+ CFBundleSignature
+ @TYPEINFO@
+ CFBundleExecutable
+ @EXECUTABLE@
+ CFBundleIdentifier
+ com.yourcompany.@EXECUTABLE@
+ NOTE
+ This file was generated by Qt/QMake.
+
+
diff --git a/tools/mkspecs/macx-clang/Info.plist.lib b/tools/mkspecs/macx-clang/Info.plist.lib
new file mode 100644
index 0000000000..97609ed0ce
--- /dev/null
+++ b/tools/mkspecs/macx-clang/Info.plist.lib
@@ -0,0 +1,18 @@
+
+
+
+
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ @SHORT_VERSION@
+ CFBundleGetInfoString
+ Created by Qt/QMake
+ CFBundleSignature
+ @TYPEINFO@
+ CFBundleExecutable
+ @LIBRARY@
+ NOTE
+ Please, do NOT change this file -- It was generated by Qt/QMake.
+
+
diff --git a/tools/mkspecs/macx-clang/qmake.conf b/tools/mkspecs/macx-clang/qmake.conf
new file mode 100644
index 0000000000..83f4c9c6d0
--- /dev/null
+++ b/tools/mkspecs/macx-clang/qmake.conf
@@ -0,0 +1,25 @@
+#macx-g++ (different from g++.conf)
+
+#
+# qmake configuration for macx-g++
+#
+# Mac OS X + command-line compiler
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = macx
+TEMPLATE = app
+CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+QT += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/Users/Alex/QtSDK/Desktop/Qt/473/gcc/mkspecs/common/mac-llvm.conf)
+
+QMAKE_CC = clang
+QMAKE_CXX = clang++
+QMAKE_LINK = clang++
+
+load(qt_config)
+
+QMAKE_CFLAGS += -Wno-unused-parameter
+QMAKE_CXXFLAGS += -Wno-unused-parameter
diff --git a/tools/mkspecs/macx-clang/qplatformdefs.h b/tools/mkspecs/macx-clang/qplatformdefs.h
new file mode 100644
index 0000000000..d6379100ff
--- /dev/null
+++ b/tools/mkspecs/macx-clang/qplatformdefs.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $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
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+#define QT_NO_LIBRARY_UNLOAD
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#ifndef QT_NO_IPV6IFNAME
+#include
+#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
+
+#endif // QPLATFORMDEFS_H