Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085		2015-08-06 10:54:01 +02:00
..
default_post.prf	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02:00
default_pre.prf	Fix iOS simulator build after 1f0823c (Rewrite simd.prf to share more code)	2014-07-30 19:37:52 +02:00
exclusive_builds_post.prf	iOS: Refactor default_post logic into more appropriate units	2015-08-04 11:58:05 +00:00
qt_config.prf	iOS: Enable fat builds containing both armv7 and arm64 slices	2014-11-13 20:00:34 +01:00
qt_parts.prf	iOS: Disable tests for all other modules than qtbase	2014-01-25 03:04:38 +01:00
qt.prf	iOS: Use LC_MAIN to wrap user main() instead of mangling object files	2015-06-29 12:39:50 +00:00
resolve_config.prf	iOS: Refactor default_post logic into more appropriate units	2015-08-04 11:58:05 +00:00
sdk.prf	Xcode: Make QMAKE_MAC_SDK_(PLATFORM_)PATH depend on active SDK	2015-03-07 01:57:48 +00:00
testcase_targets.prf	iOS: Refactor xcodebuild exclusive build logic into standalone makefile	2015-08-04 11:59:01 +00:00
testcase.prf	iOS: Refactor default_post logic into more appropriate units	2015-08-04 11:58:05 +00:00
xcodebuild.prf	iOS: Refactor xcodebuild exclusive build logic into standalone makefile	2015-08-04 11:59:01 +00:00