Frederik Gladhorn e6286ca289 Merge remote-tracking branch 'origin/release' into stable ... Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5		2014-05-03 00:56:41 +02:00
..
features	Merge remote-tracking branch 'origin/release' into stable	2014-05-03 00:56:41 +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	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
rename_main.sh	iOS: Use in-place string renaming to rename main() instead of ld	2014-01-06 20:58:28 +01:00