summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-31561-16272/+26579
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-311-15/+19
| |\
| | * QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-304-9/+16
| |\ \ | | |/
| | * Corrected case mismatch.axis2011-03-291-1/+1
| | * Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-29679-16869/+33989
| | |\
| | | * Removed useless Exit button in Symbian^3Titta Heikkala2011-03-281-0/+8
| | * | Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-304-44/+29
| |\ \ \
| | * | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| | * | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-291-1/+11
| |\ \ \ \
| | * | | | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-284-6/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-2829-194/+354
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Show softkeys when opening a dialog that has a fullscreen parent.Miikka Heikkinen2011-03-282-19/+64
| | * | | | | Fixed autotests on Windows.axis2011-03-252-2/+2
| | * | | | | QS60Style: draw QComboBox menu correctlySami Merila2011-03-251-20/+28
| | * | | | | Remove two compilation warnings for ARMSami Merila2011-03-251-2/+3
| | * | | | | QTabWidget tabs are resized in wrong way when device rotatesSami Merila2011-03-254-30/+2
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-251-12/+2
| | |\ \ \ \ \
| | | * | | | | Switched back to using symlinks for all mkspecs on Linux.axis2011-03-251-12/+2
| | * | | | | | Symbian: QComboBox popup Listbox size is not adjustedSami Merila2011-03-251-5/+0
| | |/ / / / /
| | * | | | | QS60Style: Support for Menu separatorsSami Merila2011-03-251-3/+13
| | * | | | | Native image handle provider support in QGLPixmapDataLaszlo Agocs2011-03-245-3/+78
| | * | | | | Fix an issue with VGImage readback in openvg.Laszlo Agocs2011-03-244-6/+9
| | * | | | | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-246-90/+84
| | * | | | | Call FixNativeOrientation on Symbian for certain fullscreen qml views.Laszlo Agocs2011-03-246-2/+69
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-282-1/+13
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix text selection with shift-click.Andrew den Exter2011-03-282-1/+13
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-282-8/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fixed infinite loop in QPainterPath::intersects() when qreal=float.Samuel Rødal2011-03-282-8/+12
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-2817-9/+296
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-27505-15938/+25837
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-277-14/+18
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-22323-2125/+14874
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22317-2117/+14864
| | | | |\ \ \ \ \
| | | | * | | | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-189-195/+204
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-157-209/+268
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-146-16/+83
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-0815-23/+239
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-032-4/+3
| | | | * | | | | | | | | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22270-1753/+11986
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-2116-352/+487
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-183-1/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |