Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac		2013-03-05 13:42:11 +01:00
..
aix-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
aix-g++-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
aix-xlc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
aix-xlc-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
android-g++	Introducing the Qt Android port	2013-03-05 08:31:23 +01:00
blackberry-armv7le-qcc	Blackberry adding some compiler optimizations	2013-02-25 14:13:53 +01:00
blackberry-x86-qcc	BlackBerry mkspecs: optimize linker flags	2012-11-26 15:11:59 +01:00
common	Move Xcode version extraction to xcode.conf	2013-03-04 14:54:57 +01:00
cygwin-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
darwin-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
devices	Add device mkspec for i.MX53 devices	2013-02-25 21:24:37 +01:00
features	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
freebsd-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
freebsd-g++46	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
freebsd-icc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpux-acc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpux-acc-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpux-acc-o64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpux-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpux-g++-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpuxi-acc-32	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpuxi-acc-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hpuxi-g++-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
hurd-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
irix-cc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
irix-cc-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
irix-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
irix-g++-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
linux-arm-gnueabi-g++	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-clang	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-cxx	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
linux-g++	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-g++-32	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-g++-64	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-g++-maemo	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-icc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
linux-icc-32	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-icc-64	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-kcc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
linux-llvm	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-lsb-g++	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
linux-pgcc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
lynxos-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
macx-clang	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-clang-32	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-clang-libc++	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-clang-libc++-32	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-g++	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-g++40	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-g++42	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-g++-32	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
macx-icc	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
macx-llvm	qmake: Update Xcode generator to produce project files similar to Xcode	2013-02-26 13:11:11 +01:00
macx-xcode	Use sdk.prf to set macosx-version-min instead of static conf files	2013-02-22 19:23:26 +01:00
modules	update readme to current reality	2012-01-27 13:55:27 +01:00
netbsd-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
openbsd-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
qnx-armv7le-qcc	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qnx-x86-qcc	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
sco-cc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
sco-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
solaris-cc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
solaris-cc-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
solaris-cc-64-stlport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
solaris-cc-stlport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
solaris-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
solaris-g++-64	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
tru64-cxx	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
tru64-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
unixware-cc	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
unixware-g++	purge QMAKE_LIBS_OPENGL_QT	2013-02-13 19:42:39 +01:00
unsupported	Introducing the Qt Android port	2013-03-05 08:31:23 +01:00
win32-g++	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
win32-icc	purge vestiges of QMAKE_LFLAGS_QT_DLL	2013-02-13 19:42:43 +01:00
win32-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
win32-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
win32-msvc2010	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
win32-msvc2012	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-armv4i-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-armv4i-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-mipsii-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-mipsii-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-mipsiv-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-mipsiv-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-sh4-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-sh4-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-x86-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince50standard-x86-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince60standard-armv4i-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince60standard-x86-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince70embedded-armv4i-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wince70embedded-x86-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm50pocket-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm50pocket-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm50smart-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm50smart-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm60professional-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm60professional-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm60standard-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm60standard-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm65professional-msvc2005	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
wincewm65professional-msvc2008	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00