summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-105-70/+265
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-092-26/+26
| |\
| | * Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-091-22/+22
| | * Fix code style in qgl_symbian.cppJani Hautakangas2011-02-091-4/+4
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-095-48/+243
| |\ \ | | |/
| | * QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-093-5/+125
| | * Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-082-34/+83
| | * Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-081-9/+35
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-101-7/+50
|\ \ \
| * | | Update tests for QScriptEngineAgent.Jedrzej Nowacki2011-02-101-7/+50
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-10366-1742/+15347
|\ \ \ \
| * | | | Fixes XPASSOlivier Goffart2011-02-091-1/+0
| * | | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-094-40/+5
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-04367-1744/+15385
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-049-23/+25
| | |\ \ \ \
| | | * | | | Fixed wrong casing of a Symbian library.axis2011-02-031-1/+1
| | | * | | | Fixed wrong static library extension on Symbian.axis2011-02-031-2/+0
| | | * | | | Fixed library casing.axis2011-02-031-1/+1
| | | * | | | Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-032-13/+9
| | | * | | | Fix qt.sis platform dependencies for Symbian^3 builds.Miikka Heikkinen2011-02-021-5/+7
| | | * | | | Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-022-4/+6
| | | |\ \ \ \
| | | | * | | | Make emulator deployment depend on post linking in symbian-sbsv2.Miikka Heikkinen2011-01-312-4/+6
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-03362-1719/+15385
| | |\ \ \ \ \ \
| | | * | | | | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-034-0/+22
| | | * | | | | | Correct error messageAaron Kennedy2011-02-031-2/+10
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-031-2/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Correct assertAaron Kennedy2011-02-031-2/+1
| | | * | | | | | | On windows xp using a higher port makes the declarativedebug* tests workMartin Jones2011-02-032-6/+6
| | | |/ / / / / /
| | | * | | | | | Update QDeclarative DEF files for SymbianKalle Juhani Lehtonen2011-02-022-1/+15
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-023-2/+62
| | | |\ \ \ \ \ \
| | | | * | | | | | Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-023-2/+62
| | | * | | | | | | Export QDeclarativeRefCount so that symbian compiles.Martin Jones2011-02-021-1/+1
| | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-02359-1710/+15273
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Changing header or footer failed to delete the previous.Martin Jones2011-02-028-1/+108
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-02-0215-83/+182
| | | | |\ \ \ \ \
| | | | | * | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-024-61/+69
| | | | | * | | | | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-022-5/+14
| | | | | * | | | | update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-022-4/+23
| | | | | * | | | | Improve docs on Item::visible and Item::opacityBea Lam2011-02-021-10/+33
| | | | | * | | | | Make sure we update Loader size if item size changes after creation.Martin Jones2011-02-023-1/+37
| | | | | * | | | | Froze two more symbols and fixed compilation error (QtQuick11).juhvu2011-02-023-2/+6
| | | | * | | | | | Avoid index-out-of bounds related crash in GridAlan Alpert2011-02-022-2/+20
| | | | |/ / / / /
| | | | * | | | | PinchArea sometimes failed.Martin Jones2011-02-014-27/+6
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7juhvu2011-02-0121-199/+957
| | | | |\ \ \ \ \
| | | | | * | | | | Clarify that IntValidator performs locale specific validation.Andrew den Exter2011-02-011-0/+5
| | | | | * | | | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-0117-192/+778
| | | | | * | | | | Add missing versioning tests for new QtQuick 1.1 properties/methods.Martin Jones2011-01-315-4/+171
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-01-3025-265/+503
| | | | | |\ \ \ \ \
| | | | | * | | | | | Use qobject_cast rather than dynamic_cast.Martin Jones2011-01-301-3/+3