qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update com.trolltech -> org.qtproject in the bootstrapped tools	Thiago Macieira	2012-04-16	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tools will now generate the new org.qtproject annotations only, matching the XML generator in the library. They accept both types of annotations as input though -- and will generate a warning about the older one. This commit should be backported to Qt 4, so XML files can start to be ported. Task-number: QTBUG-23274 Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
*	Merge master into api_changes	Kent Hansen	2012-03-27	1	-2/+3
\| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
*	Bootstrap qdbuscpp2xml.	Stephen Kelly	2012-03-18	2	-217/+252
\| \| \| \| \| \| \| \| \|	This involves invoking the Moc classes directly and using the data structures it provides instead of invoking the moc exectutable and parsing the generated code. Change-Id: Ia5c654e8ef58d52d0d3376252c13e13885f80da3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
*	Add qdbuscpp2xml.	Stephen Kelly	2012-03-18	2	-0/+456
	This is the pristine version from qttools at a0e2b3e96be934438974b175d0e640ed30f4efcb. Change-Id: I38eafde3f4b909bb63988f855672a908cae41d2c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>