summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2axis2011-04-261-0/+4
|\
| * Add qdoc label to QSGContextGunnar Sletta2011-04-261-0/+4
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2axis2011-04-262-12/+12
|\|
| * Fixed item transforms in Scene Graph to match GraphicsView.Kim Motoyoshi Kalland2011-04-262-12/+12
* | Update SceneGraph to use QRawFont APIEskil Abrahamsen Blomfeldt2011-04-2610-123/+91
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-26518-12961/+56745
|\ \ | |/ |/|
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-2311-19/+147
| |\
| | * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-2311-19/+147
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-2111-19/+147
| | | |\
| | | | * Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | | | * Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-213-1/+28
| | | | * Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-214-13/+78
| | | | * Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-214-5/+33
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-2227-27/+21406
| |\| | |
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2127-27/+21406
| | |\| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-214-16/+36
| | | |\ \
| | | | * | Build break fix for simulated QS60StyleSami Merila2011-04-202-11/+11
| | | | * | Drift correction and better accuracy for repeating timers in Symbianmread2011-04-202-5/+25
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-2113-1/+21290
| | | |\ \ \
| | | | * | | remove exec bit ... again ...Oswald Buddenhagen2011-04-205-0/+0
| | | | * | | Add Korean translationPark Shinjo2011-04-207-0/+21287
| | | | * | | fix unititialized value use when timestamping qconfig.hDarryl L. Miles2011-04-201-1/+3
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-209-9/+80
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-202-6/+27
| | | | * | | Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
| | | | * | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-204-1/+37
| | | | * | | Fix excessive scrolling in TextInput with mid string pre-edit text.Andrew den Exter2011-04-192-1/+15
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-211-5/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-21347-11676/+28305
| | |\ \ \ \ \
| | * | | | | | Use binary search to speed up findChildFrame()Steffen Hansen2011-04-211-5/+12
| * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-2188-641/+2126
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-218-321/+459
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-207-320/+458
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Updated Russian translationSergey Belyashov2011-04-194-319/+366
| | | | * | | | Ukrainian translation updatedVictor Ostashevsky2011-04-193-1/+92
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-201-1/+1
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-04-183-33/+50
| | | | |\ \ \ \
| | | | * | | | | Symbol table is very limited in numeric input modeSami Merila2011-04-181-1/+1
| | * | | | | | | Fix compilation with symbian-armccOlivier Goffart2011-04-191-1/+1
| | * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-201-1/+3
| | |\| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-182-1/+5
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-182-1/+5
| | * | | | | | | Fix wrong merge of 3aa39b0164ce4bb9eOlivier Goffart2011-04-191-1/+1
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-1880-318/+1663
| | |\| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-183-33/+50
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-183-33/+50
| | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-161-1/+1
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | QDesktopServices::openUrl() doesn't handle URL encodings correctlyCarlos Manuel Duclos Vergara2011-04-151-1/+1