summaryrefslogtreecommitdiffstats
path: root/src/uitools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * BC cleanup in uitools.Friedemann Kleint2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | Remove virtual functions obsoleted by new resource handling in Qt Designer 4.4. Remove static hash of private objects for formbuilder. Requires fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools. Rubber-stamped-by: axis
* | QTDIR/src compiles againLars Knoll2011-05-071-12/+12
|/
* Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-2/+5
| | | | Output warning if not present
* Fix the target for QtUiTools debug on MacPrasanth Ullattil2011-04-271-2/+0
|
* Use correct DESTDIR for UiTools.axis2011-04-271-0/+1
|
* Move uitools from QtTools to QtBaseLiang Qi2011-04-271-6/+6
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-274-0/+1200
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12