summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* make QFileSystemWatcher_win distinguish C: from C:\Zeno Albisser2010-05-271-1/+2
* make QFileSystemModel distinguish C: from C:\Zeno Albisser2010-05-271-0/+4
* Mac: fix bic breakageRichard Moe Gustavsen2010-05-213-27/+11
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-2119-233/+533
|\
| * Mac: add missing .mm fileRichard Moe Gustavsen2010-05-211-0/+125
| * Mac: add missing header fileRichard Moe Gustavsen2010-05-211-0/+84
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-2017-233/+324
| |\
| | * Allow QTextDocument to resolve URLs to the current working dir.Thiago Macieira2010-05-201-0/+2
| | * Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local UR...Thiago Macieira2010-05-202-9/+13
| | * Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSepara...Thiago Macieira2010-05-201-1/+1
| | * Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively""Thiago Macieira2010-05-201-1/+1
| | * Revert "Revert "Improve QUrl handling of local file paths""Thiago Macieira2010-05-202-22/+52
| | * Merge remote branch 'origin/master'Thiago Macieira2010-05-20752-55105/+15034
| | |\
| | * | Cocoa: remove warningsRichard Moe Gustavsen2010-05-201-4/+4
| | * | Cocoa: Glyph for "Enter" is wrong in QKeySequenceRichard Moe Gustavsen2010-05-201-1/+1
| | * | Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu barRichard Moe Gustavsen2010-05-202-71/+104
| | * | Cocoa: Add support for native application event filterRichard Moe Gustavsen2010-05-2010-125/+147
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-217-8/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-master-from-4.7Simon Hausmann2010-05-217-8/+33
| |\ \ \ | | |_|/ | |/| |
| | * | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2075-2385/+2678
| | |\ \
| | | * | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | * | Remove warnings.Warwick Allison2010-05-202-3/+0
| | | * | Add XmlListModel::errorString()Bea Lam2010-05-202-2/+28
| | * | | 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.7Alan Alpert2010-05-19374-47013/+2196
| | |\ \ \ \
| | * | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-203-28/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Qt3 Support headers: Avoid warnings from mingw g++Jonathan Nieder2010-05-203-28/+35
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-20396-48659/+4053
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| * | | | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| * | | | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-202-8/+24
| |\ \ \ \ \ \
| | * | | | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-202-8/+24
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-205-18/+21
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-203-7/+10
| | * | | | | | Fixes for docs, example codeBea Lam2010-05-202-11/+11
| * | | | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-201-0/+2
| |/ / / / / /
| * | | | | | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| * | | | | | Missing breakAaron Kennedy2010-05-201-0/+1
| * | | | | | 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/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1940-444/+1427
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | 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