Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-21 | 1 | -3/+9 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-20 | 1 | -3/+9 |
| |\ | |||||
| | * | QDeclarativeDebug: Fix endless loop for property with SCRITABLE false | Kai Koehne | 2011-04-20 | 1 | -3/+9 |
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-20 | 3 | -8/+26 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 3 | -8/+26 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-15 | 1 | -8/+8 |
| | |\ \ | | | |/ | |||||
| | | * | Resolve unqualified attached properties correctly | Aaron Kennedy | 2011-04-15 | 1 | -8/+8 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 2 | -0/+18 |
| | |\ \ | | | |/ | |||||
| | | * | Fix regression in wigglytext.qml | Michael Brasser | 2011-04-12 | 2 | -0/+18 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-18 | 1 | -1/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Alternative fix to the strict-aliasing violation warnings | Thiago Macieira | 2011-04-18 | 1 | -1/+9 |
| * | | | Revert "Fix strict-alias breaking warnings with GCC." | Thiago Macieira | 2011-04-18 | 1 | -72/+43 |
| * | | | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-04-14 | 3 | -4/+30 |
| |\ \ \ | |||||
| * | | | | Fix strict-alias breaking warnings with GCC. | Thiago Macieira | 2011-04-14 | 1 | -43/+72 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 3 | -3/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 5 | -29/+41 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Compile with QStringBuilder and QByteArray | Olivier Goffart | 2011-04-01 | 1 | -1/+1 |
| * | | | | | Fix declarative after the last changes to the QObject internals | Olivier Goffart | 2011-03-31 | 2 | -2/+2 |
* | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 1 | -1/+27 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 1 | -1/+27 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 1 | -1/+27 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Doc: Fixed markup. | David Boddie | 2011-03-25 | 1 | -2/+2 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 5 | -12/+88 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | Removing extra comma in `enum' declaration. | Sergio Ahumada | 2011-04-05 | 1 | -1/+1 |
* | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 1 | -2/+1 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 4 | -27/+40 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 4 | -4/+70 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 1 | -8/+18 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-03-01 | 1 | -1/+1 |
| * | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 16 | -65/+342 |
| |\ \ \ | |||||
| * | | | | Doc: Fixed links and whitespace. | David Boddie | 2011-02-17 | 2 | -3/+16 |
| * | | | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7 | David Boddie | 2011-02-17 | 1 | -23/+23 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7 | David Boddie | 2011-01-25 | 3 | -14/+19 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-17 | 143 | -183/+171 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-05 | 2 | -8/+20 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 2 | -49/+49 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 50 | -264/+1664 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Fix warning about unused parameter | Thiago Macieira | 2011-03-27 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-24 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-03-22 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 2 | -0/+14 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix writing to an attached property from script. | Michael Brasser | 2011-03-21 | 1 | -1/+1 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-17 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Qt.include() used in WorkerScript is broken on Windows. | Martin Jones | 2011-03-16 | 2 | -2/+2 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Remove bindings before assigning constants in VME | Aaron Kennedy | 2011-03-15 | 1 | -0/+63 |