summaryrefslogtreecommitdiffstats
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-2127-250/+688
|\
| * 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-2025-250/+479
| |\
| | * 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-203-9/+19
| | * 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-203-23/+62
| | * Merge remote branch 'origin/master'Thiago Macieira2010-05-202106-80067/+52065
| | |\
| | * | Cocoa: remove warningsRichard Moe Gustavsen2010-05-201-4/+4
| | * | Autotest, Mac: added more native key event testingRichard Moe Gustavsen2010-05-206-16/+139
| | * | 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-2123-14/+145
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-master-from-4.7Simon Hausmann2010-05-2123-14/+145
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2011-1/+81
| | |\ \ \
| | | * | | Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| | | * | | Some minor example fixesAlan Alpert2010-05-2010-0/+80
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
| | |\ \ \ \ | | | |/ / /
| | | * | | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| | | * | | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| | | |\ \ \
| | | | * | | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | | * | | Remove warnings.Warwick Allison2010-05-202-3/+0
| | | | * | | Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | | | * | | Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| | | |\ \ \ \
| | | * | | | | 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
| | | |\ \ \ \ \
| | | * | | | | | 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-202094-79942/+51696
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-20679-61363/+7170
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | 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
| | | * | | | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| | | |\ \ \ \ \ \
| | | | * | | | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | | * | | | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | | * | | | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
generated by cgit v0.12 at 2025-02-03 03:43:16 (GMT)