summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make the licenseheader check pass trivial files.Thomas Zander2010-02-171-4/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-169-58/+69
|\
| * Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1643-2831/+1129
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-16386-4218/+2641
| |\ \
| | * | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | * | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | * | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | * | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | * | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | * | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | * | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | * | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| * | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1649-330/+634
|\ \ \ \ | |_|_|/ |/| | |
| * | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
| * | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
| * | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| * | | fix line endingsOswald Buddenhagen2010-02-166-120/+120
| * | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
| * | | Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6Friedemann Kleint2010-02-1621-40/+40
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1512-40/+72
| |\ \ \ |/ / / /
| * | | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| * | | Prepare translations of the declarative module.Friedemann Kleint2010-02-159-37/+38
* | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-13383-4201/+2598
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1342-2829/+1122
|\ \ \ \
| * | | | 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
| * | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| * | | | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| * | | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| * | | | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| * | | | purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| * | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| * | | | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| * | | | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| * | | | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| * | | | simplifyOswald Buddenhagen2010-02-121-1/+1
| * | | | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-131-2/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-121-2/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-125-13/+31
| | |\ \ \
| | * | | | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
* | | | | | 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
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-122605-135/+319217
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
| | |/ / / | |/| | |