Tor Arne Vestbø d28073d9eb Distinguish between 'mac' and 'macx' qmake scopes ... The former applies both on Mac OS X and iOS, but 'macx' is specific to Mac OS X. ios.conf and macx.conf now share most of their settings in the common mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so that any overrides in the device config will apply afterwards. This means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK. Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>		2013-03-05 20:59:45 +01:00
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Correctly detect HTML 5 charset attribute in QTextCodec::codecForHtml()	2013-02-12 01:31:26 +01:00
global	Enable QGlobalStatic autotest.	2013-02-28 23:43:50 +01:00
io	Make QProcess startable with open()	2013-03-05 18:39:35 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
json	Add toJson() formatting argument to QJsonDocument interface	2013-01-26 03:09:27 +01:00
kernel	Distinguish between 'mac' and 'macx' qmake scopes	2013-03-05 20:59:45 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Distinguish between 'mac' and 'macx' qmake scopes	2013-03-05 20:59:45 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
tools	Fix QString::toUcs4() returns incorrectly resized QVector	2013-02-27 03:13:30 +01:00
xml	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00