qt5base-lts/mkspecs/common
Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/corelib/json/qjsonwriter.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbkeyboard.cpp

Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
2013-05-23 21:27:07 +02:00
..
aix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
android Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
c89 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
ios Merge remote-tracking branch 'origin/stable' into dev 2013-05-23 21:27:07 +02:00
mac iOS: Build ios platform plugin when appropriate 2013-02-27 13:07:23 +01:00
nacl Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
posix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
wince added QMAKE_EXTENSION_STATICLIB to wince mkspec 2013-04-15 15:32:40 +02:00
armcc.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
clang-mac.conf Enable C++11 on OSX when using Clang 2013-04-05 14:23:23 +02:00
clang.conf Don't duplicate SIMD QMAKE_CFLAGS for Clang 2013-04-10 11:47:05 +02:00
g++-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++-macx.conf configure: Remove the -dwarf2 argument for Mac OS X builds 2012-05-11 12:52:21 +02:00
g++-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++.conf Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
gcc-base-mac.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
gcc-base-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
gcc-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
ios.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-android.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
llvm.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
mac.conf Cache Xcode and SDK settings in .qmake.cache if it exists 2013-05-08 14:07:41 +02:00
macx.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
qcc-base-qnx-armv7le.conf centralize initialization of CONFIG in mkspecs 2012-09-08 13:36:20 +02:00
qcc-base-qnx-x86.conf centralize initialization of CONFIG in mkspecs 2012-09-08 13:36:20 +02:00
qcc-base-qnx.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
qcc-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-win32.conf Android on Windows: Add 2 missing qmake variables. 2013-04-03 00:37:48 +02:00
unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00