summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-226-17/+64
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-216-17/+64
| |\
| | * Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | * Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-213-12/+37
| | * Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-212-5/+19
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-215-4/+46
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| |\ \ | | |/
| | * QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-204-3/+45
| |\ \ | | |/
| | * QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-201-3/+9
| | * Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-193-0/+36
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-208-64/+120
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-188-64/+120
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-154-53/+50
| | |\ \ | | | |/
| | | * Resolve unqualified attached properties correctlyAaron Kennedy2011-04-151-8/+8
| | | * Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-141-5/+13
| | | * Fix so concurrent jobs produce the correct model resultsBea Lam2011-04-141-39/+28
| | | * Fix uninitialized variable.Martin Jones2011-04-141-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-142-0/+42
| | |\ \ | | | |/
| | | * Moving contentY by large values in List/GridView is slowMartin Jones2011-04-142-0/+42
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-131-9/+6
| | |\ \ | | | |/
| | | * Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-9/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-123-2/+22
| | |\ \ | | | |/
| | | * ListView has wrong keyPressEvent behaviour when verticalMartin Jones2011-04-121-2/+2
| | | * Ensure view is positioned correctly when orientation changes.Martin Jones2011-04-121-0/+2
| | | * Fix regression in wigglytext.qmlMichael Brasser2011-04-122-0/+18
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-182-2/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Alternative fix to the strict-aliasing violation warningsThiago Macieira2011-04-181-1/+9
| * | | Revert "Fix strict-alias breaking warnings with GCC."Thiago Macieira2011-04-181-72/+43
| * | | Fix warning about vSize not being used in this functionThiago Macieira2011-04-171-1/+1
| * | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-1414-102/+251
| |\ \ \
| * | | | Fix strict-alias breaking warnings with GCC.Thiago Macieira2011-04-141-43/+72
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-183-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge earth-team into origin/master'Olivier Goffart2011-04-1212-98/+224
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-0734-315/+389
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-011-1/+1
| * | | | | Fix declarative after the last changes to the QObject internalsOlivier Goffart2011-03-312-2/+2
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-122-4/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-122-4/+27
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Allow enum values to be used as signal parametersBea Lam2011-04-121-1/+27
| | * | | ListModel::clear() should not clear rolesBea Lam2011-04-121-3/+0
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-10/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-10/+22
| |\ \ \ \ | | |/ / /
| | * | | Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-072-10/+22
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0710-88/+202
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-1/+9
| |\ \ \ | | |/ /
| | * | QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debugKai Koehne2011-04-062-1/+9
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-2/+2
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-051-1/+1
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-292-2/+4
| | |\ \ \ \