summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-21/+21
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1741-3060/+101
|\
| * qmlviewer: build on symbianMichael Brasser2010-02-171-0/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-1/+1
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1639-3053/+89
| | |\
| | * | Fix QTBUG-8090, improve original patch effectiveness.Warwick Allison2010-02-161-1/+1
| * | | Conditionally link webkit on winceAaron Kennedy2010-02-171-1/+4
| | |/ | |/|
| * | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-1623-3049/+1
| * | Mobility 404Wolfgang Beck2010-02-161-0/+4
| * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1621-23/+103
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1548-1056/+1968
| |\
| * | Not exported in Qt 4.6.2, push to next release.Warwick Allison2010-02-151-5/+6
* | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
* | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
* | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-153-3/+34
|\ \ \ | |_|/ |/| |
| * | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1370-1218/+9541
|\ \ \ | |/ /
| * | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| * | Some more refactoring.kh12010-02-1212-358/+462
| * | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-121-118/+112
| |\
| | * Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| * | Make compile. QmlMetaType::isObject() has changed to isQObject().Bea Lam2010-02-121-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1151-7/+7929
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1051-7/+7929
| | |\
| | | * Revert "Compile"Martin Jones2010-02-101-2/+2
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-0951-7/+7929
| | | |\
| | | | * CompileAaron Kennedy2010-02-091-2/+2
| | | | * Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-051-1/+1
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-0551-7/+7929
| | | | |\
| | | | | * Make sure cookies are saved.Martin Jones2010-02-041-1/+4
| | | | | * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-0451-7/+7926
| | | | | |\
| | | | | | * Really run image reader in its own thread.Martin Jones2010-02-031-4/+2
| | | | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-0357-402/+359
| | | | | | |\
| | | | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-0257-402/+359
| | | | | | | |\
| | | | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-031-5/+5
| | | | | | |/ /
| | | | | | * | Move image network access into a separate thread, with decoding.Martin Jones2010-01-292-59/+109
| | | | | | * | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-2718-117/+424
| | | | | | |\ \
| | | | | | * | | Compile with Qt 4.6.1Aaron Kennedy2010-01-201-0/+10
| | | | | | * | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-208-12/+13
| | | | | | |\ \ \
| | | | | | * \ \ \ 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 int...Alan Alpert2010-01-191-0/+3
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | 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
| | | | | | |/ / / / /
| | | | | | * | | | | Doc fixes.Michael Brasser2010-01-152-3/+3
| | | | | | * | | | | 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 int...Aaron Kennedy2010-01-141212-1347/+1533
| | | | | | |\ \ \ \ \