Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 2 | -2/+2 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix line information for dynamic slots in .qml files | Kai Koehne | 2011-03-09 | 1 | -1/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | fix/improve docs for new QtQuick 1.1 attributes | Bea Lam | 2011-02-28 | 1 | -8/+18 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 4 | -35/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix compilation on INTEGRITY | Rolland Dudemaine | 2011-02-22 | 4 | -35/+35 |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 8 | -26/+24 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Joona Petrell | 2011-02-22 | 6 | -17/+22 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-20 | 3 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix warnings in QtDeclarative | Thiago Macieira | 2011-02-17 | 3 | -3/+3 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 1 | -8/+10 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Ensure animations start correctly when running is bound to a value. | Michael Brasser | 2011-02-21 | 3 | -15/+10 |
| * | | | | | | | | | | Ensure QDeclarativeListProperty docs are associated with QtDeclarative. | Martin Jones | 2011-02-20 | 1 | -0/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | QDeclarativeDebug: Fix crash when serializing list of QObjects | Kai Koehne | 2011-02-16 | 1 | -8/+10 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 2 | -17/+80 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 2 | -17/+80 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Correct the "module not installed" error handling | Aaron Kennedy | 2011-02-11 | 1 | -12/+13 |
| | * | | | | | | | Make addImportPath() work for windows paths starting with lower case | Bea Lam | 2011-02-11 | 1 | -2/+4 |
| | * | | | | | | | Report any exceptions occurring in WorkerScript javascript code | Bea Lam | 2011-02-11 | 1 | -3/+63 |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 9 | -38/+259 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-10 | 3 | -5/+62 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Update modules-related tests and docs | Bea Lam | 2011-02-10 | 2 | -2/+24 |
| | * | | | | | | | CLeanup registers after AddString | Aaron Kennedy | 2011-02-10 | 1 | -3/+38 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-08 | 1 | -12/+64 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Support seperate versions of installed modules | mae | 2011-02-08 | 1 | -12/+64 |