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
..
arch_host.pro	Ensure that arch.test for host runs with option(host_build)	2013-02-18 17:07:13 +01:00
arch.cpp	Replace the Intel Haswell and Ivy Bridge codenames with actual names	2013-08-08 02:46:45 +02:00
arch.pro	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00