summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | * | | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-192-2/+3
| | | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Alan Alpert2010-01-191-0/+3
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * | | | | | | | Doc.Martin Jones2010-01-191-0/+1
| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | Allow the QML based file browser to be used in place of native.Martin Jones2010-01-191-0/+2
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Fix bad behaviour on N900Alan Alpert2010-01-191-1/+1
| | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7431 Reviewed-by: akennedy
| | | | | | * | | | | | | | Doc fixes.Michael Brasser2010-01-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7322
| | | | | | * | | | | | | | Remove debuggingAaron Kennedy2010-01-141-1/+0
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Add toggle orientation optionAaron Kennedy2010-01-142-0/+14
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-141212-1347/+1533
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141212-1347/+1533
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | | | | | * | | | | | | | | | Only force graphicssystem raster on X11Aaron Kennedy2010-01-141-1/+1
| | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | Various QML browser improvementsMartin Jones2010-01-121-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Easier to press Up button - Fix highlight color - Fix keypad navigation
| | | | | | * | | | | | | | | Always exit on play script failureAaron Kennedy2010-01-121-1/+1
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Move choice of pipelining to the point request.Warwick Allison2010-01-111-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (based on advice from Thiago)
| | | | | | * | | | | | | | | PreferNetwork (the default) is fixed, no need to force PreferCache.Warwick Allison2010-01-081-1/+0
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-0529-755/+4397
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-0529-755/+4397
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | WGZ is just a ZIP, so accept that too.Warwick Allison2010-01-051-1/+2
| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | Basic WGT/WGZ support.Warwick Allison2010-01-053-6/+109
| | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-524
| | | | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-12-1815-1635/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * | | | | | | | | | Remove creatorplugin (it's moved to the creator repository)Bea Lam2009-12-1715-1635/+0
| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1712-164/+219
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| | | | | | * | | | | | | | | | | Make QListModelInterface API more sensible for our use case.Martin Jones2009-12-162-0/+15
| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-1/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Compile when in a module.Warwick Allison2009-12-082-3/+3
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Add info about qmldebugger and its creator plugin, with screenshot.Bea Lam2009-12-082-6/+12
| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-5/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-12-0726-59/+343
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-12-0720-42/+191
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-0720-42/+191
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| | | | | | | * | | | | | | | | | | | | | | Move loader functionality into qmlviewer.Martin Jones2009-12-075-31/+115
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-12-0711-8/+782
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * | | | | | | | | | | | | | | Bring up network on Symbian.Martin Jones2009-12-072-0/+51
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | Fix leaks.Michael Brasser2009-12-071-3/+1
| | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Add QML based file browser to qmlviewer.Martin Jones2009-12-0611-8/+782
| | | | | | |/ / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | Compile as module.Warwick Allison2009-12-022-0/+3
| | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-015-3/+316
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | | * | | | | | | | | | | | | | Build correct QmlViewer Screen orientation implementation for Maemo.Martin Jones2009-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Cleanup orientation stuff.Martin Jones2009-12-011-14/+2
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-018-33/+77
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | | * | | | | | | | | | | | | | | Add Screen element in QmlViewr Module including orientation property.Martin Jones2009-12-015-3/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for automatic Maemo rotation update.
| | | | | | * | | | | | | | | | | | | | | | Compile when in module.Warwick Allison2009-12-011-0/+1
| | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-308-33/+77
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| | | | | | * | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-301-0/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | | * | | | | | | | | | | | | | | Qt.quit() added to qml.Tapani Mikola2009-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | Add orientation property to qmlviewer.Martin Jones2009-11-302-3/+48
| | | | | | |/ / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-2770-755/+843
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | | | * | | | | | | | | | | | | | | | Fix for packaging as module.Warwick Allison2009-11-261-1/+2
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1920-107/+319
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-122-32/+2
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui