Frederik Gladhorn 733ace5a7a Merge remote-tracking branch 'origin/release' into stable ... Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5		2013-12-05 17:42:33 +01:00
..
features	Merge remote-tracking branch 'origin/release' into stable	2013-12-05 17:42:33 +01:00
Default-568h@2x.png	iOS: Provide default launch image for 4-inch devices	2013-11-29 09:55:23 +01:00
Info.plist.app	qmake: Pick up default bundle prefix from Xcode preferences	2013-10-31 12:33:55 +01:00
Info.plist.lib	Move iOS makespec out of unsupported directory	2013-09-12 12:29:33 +02:00
qmake.conf	iOS: Don't hard-code simulator and device architectures	2013-10-18 15:36:16 +02:00
qplatformdefs.h	Move iOS makespec out of unsupported directory	2013-09-12 12:29:33 +02:00