summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-171-10/+17
|\
| * Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-10/+17
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-171-2/+3
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-161-2/+3
| | | |\
| | | | * Fix broken image loading on windows.kh12010-02-161-2/+3
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-167-11/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Bump version to 4.6.3.Jason McDonald2010-02-157-11/+11
| | | |/
| | * | Fix QT_BUILD_KEY for Symbian.Miikka Heikkinen2010-02-161-10/+17
| | |/
* | | 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
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141212-1347/+1533
| | | | | | | |\ \ \ \ \ \
| | | | | | * | | | | | | | Only force graphicssystem raster on X11Aaron Kennedy2010-01-141-1/+1
| | | | | | |/ / / / / / /
| | | | | | * | | | | | | Various QML browser improvementsMartin Jones2010-01-121-10/+20
| | | | | | * | | | | | | Always exit on play script failureAaron Kennedy2010-01-121-1/+1