Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
bootstrap	Enable categorized logging for bootstrapped tools	2014-02-11 15:53:10 +01:00
bootstrap-dbus	redo include path logic for pre-generated headers	2013-06-10 21:12:29 +02:00
moc	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
qdbuscpp2xml	QDBus: improve error handling, to give the developer feedback.	2013-07-01 17:04:23 +02:00
qdbusxml2cpp	qdbusxml2cpp: Use the mtime on the input XML to avoid needless source changes.	2013-11-30 20:49:41 +01:00
qdoc	qdoc: fix memory leaks, unchecked open(), hardcoded path - in debugging code	2014-02-10 11:00:41 +01:00
qlalr	move and build qlalr	2014-01-20 09:26:47 +01:00
rcc	rcc: Remove compile dependency on private headers.	2013-09-26 22:25:10 +02:00
uic	uic: Accept an -include argument to generate a #include.	2013-11-11 15:56:52 +01:00