summaryrefslogtreecommitdiffstats
path: root/src/tools/qdbuscpp2xml
Commit message (Collapse)AuthorAgeFilesLines
* don't refer to module versions during bootstrapOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | | once we auto-generate the pris while building their respective modules, the versions won't be available during bootstrap yet. however, as these are core modules, their version is locked to the global $$QT_VERSION anyway, so just use that. Change-Id: I092f5e7d4dfe99c03e0df71f9409cac9be9f2297 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* remove some qmake -project boilerplate from project filesOswald Buddenhagen2012-06-191-3/+0
| | | | | Change-Id: I5e6103db42b4fcca4ed4c2ffaec71e71e73d5b95 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* properly declare the host tools as such in the project filesOswald Buddenhagen2012-06-191-1/+1
| | | | | | | don't mess with the qmake cmdline args any more. Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update com.trolltech -> org.qtproject in the bootstrapped toolsThiago Macieira2012-04-161-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_changesKent Hansen2012-03-271-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 Kelly2012-03-182-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 Kelly2012-03-182-0/+456
This is the pristine version from qttools at a0e2b3e96be934438974b175d0e640ed30f4efcb. Change-Id: I38eafde3f4b909bb63988f855672a908cae41d2c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>