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
..
moc	moc: add unittest for --ignore-option-clashes	2013-07-30 09:36:25 +02:00
qdbuscpp2xml	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qdbusxml2cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qmake	make split_value_list() even less sane again	2013-07-03 21:38:37 +02:00
rcc	RCC: Make auto-test pick up the right binary	2013-08-13 17:24:49 +02:00
uic	Fix module name format in displayed code	2013-02-11 01:43:21 +01:00
tools.pro	test: Disable tst_uic when -no-widgets is used	2013-04-22 16:24:44 +02:00