summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-313-6/+3
|\
| * doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| * QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-313-15/+45
|\ \
| * | Prevent calling deleteLater() from QMLAaron Kennedy2010-08-311-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-316-68/+27
| |\ \ | | |/
| * | Ignore non-scriptable properties in QMLAaron Kennedy2010-08-313-13/+43
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-314-144/+275
|\ \ \ | |_|/ |/| |
| * | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| * | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-312-139/+259
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-302-139/+259
| | |\ \
| | | * | Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-08-301-1/+2
| | | * | qdrawhelper: backport the optimisations in fetchTransformBilinear from master...Olivier Goffart2010-08-301-138/+257
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3123-1199/+1728
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-6/+6
| |\ \ \
| | * | | Notify QML internal notifiers of item geometry changes before QML signal hand...Martin Jones2010-08-311-6/+6
| * | | | Don't double call classBegin()Aaron Kennedy2010-08-311-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3125-101/+201
| |\ \ \ \
| | * | | | Revert "Add 'cached' property to Image."Yann Bodson2010-08-317-74/+17
| | * | | | Add 'cached' property to Image.Yann Bodson2010-08-317-17/+74
| | |/ / /
| | * | | Ensure Flickable visibleArea is updated when view height changesMartin Jones2010-08-313-0/+15
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-303-6/+14
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-303-6/+14
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3034-426/+17
| | | | |\
| | | | | * QDeclarativeDebug: Destroy incoming connections if already connectedLasse Holmstedt2010-08-271-0/+2
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2731-215/+456
| | | | |\ \
| | | | * | | Fix VisualDataModel model update handling when rootIndex is specified.Martin Jones2010-08-271-6/+9
| * | | | | | Simplify type management codeAaron Kennedy2010-08-2717-1186/+1470
| * | | | | | QML JavaScript .import parserAaron Kennedy2010-08-272-0/+222
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-306-68/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2010-08-301-0/+5
| * | | | | Fix static build on Windows with MinGW.Mark Brand2010-08-301-1/+1
| * | | | | Reenable the reporting of CPU features.Thiago Macieira2010-08-301-2/+3
| * | | | | Doc: Fixed qdoc warnings and generalized the date and time descriptions.David Boddie2010-08-271-16/+2
| * | | | | Doc: Whitespace fixes.David Boddie2010-08-271-3/+3
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-272-52/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | doc: Fixed numerous qdoc warnings.Martin Smith2010-08-272-52/+19
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-301-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-08-2778-673/+540
| |\ \ \ \ \ | | |/ / / /
| * | | | | QLineEdit cursor is shown when asked to be non-visibleSami Merila2010-08-271-1/+3
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-3018-94/+169
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Correct last right bearing in boundingBox(glyphs)Jiang Jiang2010-08-277-17/+26
| * | | | | Make sure propagated font in QGraphicsWidget can be set on a QPainterEskil Abrahamsen Blomfeldt2010-08-272-1/+6
| * | | | | Apparently QPen::brush() can't return a NoBrush for a NoPen.Trond Kjernåsen2010-08-272-6/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-279-72/+135
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-279-72/+135
| | |\ \ \ \
| | | * | | | Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.Trond Kjernåsen2010-08-261-0/+2
| | | * | | | use QFile:map instead of ::mmapArvid Ephraim Picciani2010-08-261-43/+5