Frederik Gladhorn dbafabb019 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9		2014-02-17 11:39:16 +01:00
..
moc	Merge remote-tracking branch 'origin/stable' into dev	2014-02-17 11:39:16 +01:00
qdbuscpp2xml	Test that Qt tools can handle ' as a digit separator.	2013-10-30 09:44:07 +01:00
qdbusxml2cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qmake	Add JSON parsing support to qmake.	2013-10-17 08:07:25 +02:00
rcc	RCC: Make auto-test pick up the right binary	2013-08-13 17:24:49 +02:00
uic	uic: Accept an -include argument to generate a #include.	2013-11-11 15:56:52 +01:00
tools.pro	test: Disable tst_uic when -no-widgets is used	2013-04-22 16:24:44 +02:00