summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1758-388/+703
|\
| * 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
* | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
* | | | | Fix QNetworkSession unit test.Aaron McCarthy2010-02-163-10/+14
* | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
* | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
* | | | | Make this a warning.Aaron McCarthy2010-02-161-2/+2
* | | | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
* | | | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
* | | | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
* | | | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
* | | | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
* | | | | Simplify.Aaron McCarthy2010-02-151-2/+1
* | | | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
* | | | | Use snippets.Aaron McCarthy2010-02-152-8/+50
* | | | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
* | | | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-152-4/+38
* | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-142686-3162/+320692
|\ \ \ \ \ | |/ / / /
| * | | | 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