summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \
| | * | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2243-627/+2218
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-064-81/+186
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-064-81/+186
| * | | | | | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-042-3/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | XmlListModel should allow types other than application/xmlBea Lam2011-04-041-1/+1
| | * | | | | | Document using Behaviors with States.Michael Brasser2011-04-041-2/+3
* | | | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-052-5/+1
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-0332-302/+388
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0111-117/+184
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0111-117/+184
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Changing width of RTL positioner doesn't relayoutMartin Jones2011-04-011-0/+10
| | | * | | | | PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-314-111/+146
| | | * | | | | Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-313-1/+17
| | | * | | | | Canceling image download while reading causes crashMartin Jones2011-03-303-3/+7
| | | * | | | | Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-301-2/+4
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3122-185/+204
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-301-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2722-184/+201
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2236-534/+1910
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-0916-97/+312
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | * | | Doc: Small change to ListModel docsGeir Vattekar2011-03-071-1/+1
| | | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-2/+2
| | | * | | Merge branch 'mimir' into 4.7Martin Smith2011-03-011-1/+1
| | | |\ \ \