summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-195-9/+27
| |\ \
| | * | Fix platform regression: Support QFont::setStretch() on CocoaEskil Abrahamsen Blomfeldt2010-05-192-6/+15
| | * | Fix a memory leak from QItemSelectionModel when changing the modelThierry Bastian2010-05-191-1/+5
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-05-191337-10774/+21159
| | |\ \
| | * | | Small hack to allow forcing off font smoothing on Mac OS XEskil Abrahamsen Blomfeldt2010-05-192-2/+7
* | | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19146-852/+2824
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1927-211/+698
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-195-163/+242
| | | |\ \ \
| | | | * | | Rename qml executable to qmlviewerKai Koehne2010-05-193-6/+8
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-199-162/+439
| | | | |\ \ \
| | | | | * | | Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | * | | | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | | * | | | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-197-10/+137
| | | | |/ / / | | | |/| | |
| | | * | | | Bug moved.Warwick Allison2010-05-191-1/+1
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1979-127/+349
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | | * | | Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14
| | | | * | | Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-1810-34/+34
| | | * | | | docWarwick Allison2010-05-191-0/+2
| | | * | | | docWarwick Allison2010-05-197-5/+204
| | * | | | | Doc improvementsBea Lam2010-05-1910-228/+244
| | * | | | | Remove image example (covered in class docs)Bea Lam2010-05-1911-183/+0
| | * | | | | Add missing .qmlproject filesBea Lam2010-05-193-0/+48
| | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-19341-56727/+25
| |\ \ \ \ \
| | * | | | | removed test file, part of mediaservice removal.Kurt Korbatits2010-05-191-0/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-18340-56727/+25
| | |\ \ \ \ \
| | | * | | | | Rebuild configure.exeAndrew den Exter2010-05-181-0/+0
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181362-11510/+22502
| | | |\ \ \ \ \
| | | * | | | | | Rebuild configure following the removal of media services.Andrew den Exter2010-05-181-0/+0
| | | * | | | | | More mediaservices removal work.Derick Hawcroft2010-05-181-11/+1
| | | * | | | | | Removed mediaservices.Kurt Korbatits2010-05-18338-56706/+24
| * | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-19186-1126/+15842
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-195-17/+57
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-191-3/+27
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed tst_compilerwarnings test failure due to icecc node failures.Rohan McGovern2010-05-191-3/+27
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-181-2/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | QNAM HTTP: Remove dead codeMarkus Goetz2010-05-181-2/+0
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-173-12/+30
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Doc: fix typoOlivier Goffart2010-05-171-1/+1
| | | | * | | | | | | | QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
| | | | * | | | | | | | qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-172-5/+18
| | * | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-18182-1109/+15785
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| | * | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-18182-1109/+15785
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-17182-1109/+15785
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-172-0/+10
| | | | |\ \ \ \ \ \ \ \