summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Merge commit 'origin/4.7' into mimirMorten Engvoldsen2010-10-06106-1096/+1166
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0480-617/+7674
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-09-30116-5072/+1740
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-3044-4601/+667
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2972-471/+1073
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2710-48/+36
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | qdoc: Added missing </section>; added "span" infor temporarily.Martin Smith2010-09-301-20/+19
| | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2341-271/+274
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2129-251/+742
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-211-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMorten Engvoldsen2010-09-201-8/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-8/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-044-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed library casing.axis2011-02-031-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-031-7/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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-qml into 4.7-integrationQt Continuous Integration System2011-02-03160-1360/+7024
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-032-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | Correct error messageAaron Kennedy2011-02-031-2/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | Correct assertAaron Kennedy2011-02-031-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-021-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Export QDeclarativeRefCount so that symbian compiles.Martin Jones2011-02-021-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Changing header or footer failed to delete the previous.Martin Jones2011-02-022-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-02-028-67/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-022-54/+59
| | * | | | | | | | | | | | | | | | | | | | | | | | | | update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-021-0/+9
| | * | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | PinchArea sometimes failed.Martin Jones2011-02-013-3/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7juhvu2011-02-0110-78/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | 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-019-75/+148
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-01-3015-125/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Use qobject_cast rather than dynamic_cast.Martin Jones2011-01-301-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Froze Symbian def files for QtQuick11.juhvu2011-02-018-84/+246
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-30151-1250/+6586
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-29151-1250/+6586
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qtquick11' into 4.7Martin Jones2011-01-28151-1249/+6585
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Allow functions to be passed in as values for grouped propertiesBea Lam2011-01-281-3/+14
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Adding support for group properties in Component::CreateObject()Christopher Ham2011-01-281-1/+5
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Fix test breakage for qdeclarativeworkerscriptBea Lam2011-01-281-1/+3
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Add support for line spacing in Text element.Yann Bodson2011-01-285-6/+115
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-284-12/+35
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-281-24/+20