summaryrefslogtreecommitdiffstats
path: root/mkspecs/qws
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-3121-273/+273
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * Update tech preview license header.Jason McDonald2009-08-3121-273/+273
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-314-0/+164
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * Add missing license headers.Jason McDonald2009-08-284-0/+164
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1117-17/+17
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-1317-17/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| * | Update contact URL in license headers.Jason McDonald2009-08-1217-17/+17
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1917-34/+34
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1617-34/+34
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-2342-0/+1329
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+62
|
* Long live Qt!Lars Knoll2009-03-2342-0/+1329