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
..
features	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02: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	Remove exec bits from files that should not be executable	2015-06-07 22:50:19 +00:00
Info.plist.lib	Add CFBundleVersion to the Info.plist files.	2014-10-01 10:56:41 +02:00
ios_destinations.sh	iOS: Refactor xcodebuild exclusive build logic into standalone makefile	2015-08-04 11:59:01 +00:00
LaunchScreen.xib	iOS: let qmake generate default LaunchScreen.xib	2014-11-11 20:43:05 +01:00
qmake.conf	iOS: Use LC_MAIN to wrap user main() instead of mangling object files	2015-06-29 12:39:50 +00:00
qplatformdefs.h	Update copyright headers	2015-02-11 06:49:51 +00:00
xcodebuild.mk	iOS: Refactor xcodebuild exclusive build logic into standalone makefile	2015-08-04 11:59:01 +00:00