summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'variousFixes' into 4.7-s60axis2010-09-016-42/+53
|\
| * Fixed input context trying to squeeze content into a full widget.axis2010-09-011-0/+7
| * Fixed a case where a newly created native widget would lose focus.axis2010-09-011-9/+20
| * Cleaned up position tracking in the Symbian input methods.axis2010-09-013-15/+18
| * Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-013-16/+2
| * Added catching of errors in timers.axis2010-09-011-2/+6
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-0158-1572/+2318
|\ \
| * | fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-315-27/+45
| |\ \
| | * | Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| | * | QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| | * | 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/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-315-12/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Undefined SSE symbols when crosscompiling Qt on PPC.Benjamin Poulain2010-08-315-12/+8
| * | | | 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