Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a		2013-08-14 09:06:31 +02:00
..
qeglfshooks_imx6.cpp	eglfs/imx6: Implement platformDisplay() in hooks	2013-08-06 15:52:59 +02:00
qmake.conf	Fixed mkspecs/devices/linux_device_post.conf for non-arm platforms.	2013-07-24 18:58:24 +02:00
qplatformdefs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00