summaryrefslogtreecommitdiffstats
path: root/src
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-1940-444/+1427
| |\
| * \ 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-19333-4865/+8004
| | |\ \
| | * | | Small hack to allow forcing off font smoothing on Mac OS XEskil Abrahamsen Blomfeldt2010-05-192-2/+7
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19374-47013/+2196
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-1938-436/+1411
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1913-176/+386
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-192-157/+234
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-194-161/+271
| | | | |\ \ \
| | | | | * | | 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-196-10/+92
| | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1910-31/+101
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | 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-181-2/+2
| | | * | | | docWarwick Allison2010-05-193-5/+39
| | * | | | | Doc improvementsBea Lam2010-05-194-131/+152
| | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-19288-45894/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-18288-45894/+19
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-18353-5596/+9091
| | | |\ \ \ \ \
| | | * | | | | | More mediaservices removal work.Derick Hawcroft2010-05-181-11/+1
| | | * | | | | | Removed mediaservices.Kurt Korbatits2010-05-18287-45873/+18
| * | | | | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-192-9/+12
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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-171-7/+12
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Doc: fix typoOlivier Goffart2010-05-171-1/+1
| | | * | | | | | | | QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
| * | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-1854-710/+1400
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-1854-710/+1400
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-1754-710/+1400
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-143-4/+12
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-142-4/+11
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelikeSami Merila2010-05-142-4/+11
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-141-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | QNetworkAccessManager: Backends were tried in wrong orderMarkus Goetz2010-05-141-1/+1
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-141-3/+11
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Fix QUrl::isValid if the host contains invalid caracter.Olivier Goffart2010-05-141-2/+8
| | | | | * | | | | | | QUrl: parsing of host name with an undercore.Olivier Goffart2010-05-141-1/+3
| | | | | |/ / / / / /
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-131-0/+3
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | | * | | | | | QNAM HTTP: Preemptive anti crash if() statementMarkus Goetz2010-05-131-0/+3
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-121-4/+83
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | OpenVG blending modes from VG_KHR_advanced_blending extensionRhys Weatherley2010-05-121-4/+83
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-4/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |