qt5base-lts/mkspecs/macx-ios-clang/features
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
..
default_post.prf Merge remote-tracking branch 'origin/release' into stable 2013-12-05 17:42:33 +01:00
default_pre.prf iOS: Build simulator libraries with suffix 2013-10-30 00:34:34 +01:00
qt_config.prf iOS: Add default QT_ARCH for configure tests to our own qt_config.prf 2013-10-18 15:36:05 +02:00
qt.prf iOS: Be more specific in where we look for object files to rename main 2013-10-31 10:00:49 +01:00