qt5base-lts/mkspecs
Lars Knoll 9bd0323551 Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
2012-04-16 12:04:34 +02:00
..
aix-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
aix-g++-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
aix-xlc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
aix-xlc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
cmake Overwrite the LIB_DEPENDENCIES of modules. 2012-03-31 01:49:26 +02:00
common Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CM 2012-04-11 12:37:34 +02:00
cygwin-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
darwin-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
devices directfb: Integrate building into configure. 2012-04-13 18:15:26 +02:00
features Make plugin linking fail if some references aren't present 2012-04-10 18:22:51 +02:00
freebsd-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
freebsd-g++34 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
freebsd-g++40 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
freebsd-icc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpux-acc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpux-acc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpux-acc-o64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpux-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpux-g++-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpuxi-acc-32 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpuxi-acc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hpuxi-g++-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
hurd-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
irix-cc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
irix-cc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
irix-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
irix-g++-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
linux-arm-gnueabi-g++ Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-cxx remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
linux-ecc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
linux-g++ Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-g++-32 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-g++-64 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-g++-maemo Include generic ARM qplatformdefs.h in linux-g++-maemo mkspec 2012-03-19 20:16:04 +01:00
linux-icc Disable ICC diagnostic 2261 about __assume with side-effects 2012-03-27 05:35:57 +02:00
linux-icc-32 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-icc-64 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-kcc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
linux-llvm Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
linux-lsb-g++ Use the LSB linker to link 2012-03-15 00:50:47 +01:00
linux-pgcc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
lynxos-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
macx-clang Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-g++ Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-g++40 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-g++42 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-icc Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-llvm Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-pbuilder Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
macx-xcode Add support for XCode 4 into qmake 2012-03-01 00:09:57 +01:00
macx-xlc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
modules update readme to current reality 2012-01-27 13:55:27 +01:00
netbsd-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
openbsd-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
sco-cc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
sco-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
solaris-cc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
solaris-cc-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
solaris-cc-64-stlport Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
solaris-cc-stlport Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
solaris-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
solaris-g++-64 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
tru64-cxx remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
tru64-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
unixware-cc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
unixware-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs 2012-03-01 21:00:07 +01:00
unsupported Moving stack-smashing protection to the Blackberry mkspecs 2012-04-06 00:02:45 +02:00
win32-g++ remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2) 2012-03-09 18:50:52 +01:00
win32-icc remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2) 2012-03-09 18:50:52 +01:00
win32-msvc2005 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2) 2012-03-09 18:50:52 +01:00
win32-msvc2008 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2) 2012-03-09 18:50:52 +01:00
win32-msvc2010 remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2) 2012-03-09 18:50:52 +01:00
wince50standard-armv4i-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-armv4i-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-mipsii-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-mipsii-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-mipsiv-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-mipsiv-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-sh4-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-sh4-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-x86-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince50standard-x86-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince60standard-armv4i-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince60standard-x86-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wince70embedded-armv4i-msvc2008 Enable basic gesture support for WEC7. 2012-02-06 05:15:11 +01:00
wince70embedded-x86-msvc2008 Enable basic gesture support for WEC7. 2012-02-06 05:15:11 +01:00
wincewm50pocket-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm50pocket-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm50smart-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm50smart-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm60professional-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm60professional-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm60standard-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm60standard-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm65professional-msvc2005 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
wincewm65professional-msvc2008 Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00