summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-3/+9
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-3/+9
| |\
| | * QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-201-3/+9
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-203-8/+26
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-8/+26
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-8/+8
| | |\ \ | | | |/
| | | * Resolve unqualified attached properties correctlyAaron Kennedy2011-04-151-8/+8
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-122-0/+18
| | |\ \ | | | |/
| | | * 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-181-1/+9
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-143-4/+30
| |\ \ \
| * | | | 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-122-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-075-29/+41
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | 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-121-1/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-1/+27
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Allow enum values to be used as signal parametersBea Lam2011-04-121-1/+27
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-3/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | 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
| |\ \ \
| | * | | 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-225-12/+88
| | |\ \ \ | | | |/ /
| * | | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
* | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-2/+1
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-314-27/+40
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-224-4/+70
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-8/+18
| |\ \ \ | | |_|/ | |/| |
| * | | Doc: Fixed qdoc warnings.David Boddie2011-03-011-1/+1
| * | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-2316-65/+342
| |\ \ \
| * | | | Doc: Fixed links and whitespace.David Boddie2011-02-172-3/+16
| * | | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-23/+23
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-253-14/+19
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17143-183/+171
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-8/+20
| | |\ \ \ \ \ \
| | * | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-202-49/+49
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0450-264/+1664
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Fix warning about unused parameterThiago Macieira2011-03-271-1/+1
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-242-0/+14
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-222-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+14
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Fix writing to an attached property from script.Michael Brasser2011-03-211-1/+1
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-162-2/+2
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-0/+63
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Remove bindings before assigning constants in VMEAaron Kennedy2011-03-151-0/+63