summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 08:07:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 08:07:35 (GMT)
commitbe04377b22475772e376a51017855a00cc732e80 (patch)
tree0e692911fc3a0f9dac54289778236abcc2c7904b /examples
parentc12af169a157a5ba2e25289b996648a9a8e3cb9f (diff)
parent6c5d190923fb23e2f644e71ac2393c25619848c8 (diff)
downloadQt-be04377b22475772e376a51017855a00cc732e80.zip
Qt-be04377b22475772e376a51017855a00cc732e80.tar.gz
Qt-be04377b22475772e376a51017855a00cc732e80.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions