Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make QFileSystemWatcher_win distinguish C: from C:\ | Zeno Albisser | 2010-05-27 | 1 | -1/+2 |
* | make QFileSystemModel distinguish C: from C:\ | Zeno Albisser | 2010-05-27 | 1 | -0/+4 |
* | Mac: fix bic breakage | Richard Moe Gustavsen | 2010-05-21 | 3 | -27/+11 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-05-21 | 19 | -233/+533 |
|\ | |||||
| * | Mac: add missing .mm file | Richard Moe Gustavsen | 2010-05-21 | 1 | -0/+125 |
| * | Mac: add missing header file | Richard Moe Gustavsen | 2010-05-21 | 1 | -0/+84 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-05-20 | 17 | -233/+324 |
| |\ | |||||
| | * | Allow QTextDocument to resolve URLs to the current working dir. | Thiago Macieira | 2010-05-20 | 1 | -0/+2 |
| | * | Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local UR... | Thiago Macieira | 2010-05-20 | 2 | -9/+13 |
| | * | Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSepara... | Thiago Macieira | 2010-05-20 | 1 | -1/+1 |
| | * | Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"" | Thiago Macieira | 2010-05-20 | 1 | -1/+1 |
| | * | Revert "Revert "Improve QUrl handling of local file paths"" | Thiago Macieira | 2010-05-20 | 2 | -22/+52 |
| | * | Merge remote branch 'origin/master' | Thiago Macieira | 2010-05-20 | 752 | -55105/+15034 |
| | |\ | |||||
| | * | | Cocoa: remove warnings | Richard Moe Gustavsen | 2010-05-20 | 1 | -4/+4 |
| | * | | Cocoa: Glyph for "Enter" is wrong in QKeySequence | Richard Moe Gustavsen | 2010-05-20 | 1 | -1/+1 |
| | * | | Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu bar | Richard Moe Gustavsen | 2010-05-20 | 2 | -71/+104 |
| | * | | Cocoa: Add support for native application event filter | Richard Moe Gustavsen | 2010-05-20 | 10 | -125/+147 |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-05-21 | 7 | -8/+33 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-master-from-4.7 | Simon Hausmann | 2010-05-21 | 7 | -8/+33 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Update docs with correct property name | Alan Alpert | 2010-05-20 | 1 | -1/+1 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-20 | 75 | -2385/+2678 |
| | |\ \ | |||||
| | | * | | Work around rendering bug in Rectangle. | Michael Brasser | 2010-05-20 | 1 | -1/+3 |
| | | * | | Remove warnings. | Warwick Allison | 2010-05-20 | 2 | -3/+0 |
| | | * | | Add XmlListModel::errorString() | Bea Lam | 2010-05-20 | 2 | -2/+28 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-19 | 5 | -9/+27 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-19 | 374 | -47013/+2196 |
| | |\ \ \ \ | |||||
| | * | | | | | Update old keyword in docs | Alan Alpert | 2010-05-19 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-05-20 | 3 | -28/+35 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Qt3 Support headers: Avoid warnings from mingw g++ | Jonathan Nieder | 2010-05-20 | 3 | -28/+35 |
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-05-20 | 396 | -48659/+4053 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Be consistent in conversion from string (eg. color, int rounding). | Warwick Allison | 2010-05-20 | 1 | -11/+14 |
| * | | | | | | Simplify code to make next change clearer. | Warwick Allison | 2010-05-20 | 1 | -14/+9 |
| * | | | | | | Stop warnings. | Warwick Allison | 2010-05-20 | 2 | -11/+11 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 2 | -8/+24 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Stop highlight animators for highlightFollowsCurrentItem: false | Martin Jones | 2010-05-20 | 2 | -8/+24 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 5 | -18/+21 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Rename Component::errorsString() -> errorString() (and also for | Bea Lam | 2010-05-20 | 3 | -7/+10 |
| | * | | | | | | Fixes for docs, example code | Bea Lam | 2010-05-20 | 2 | -11/+11 |
| * | | | | | | | Ensure valuetype enums can be assigned from JS | Aaron Kennedy | 2010-05-20 | 1 | -0/+2 |
| |/ / / / / / | |||||
| * | | | | | | Add return value for resolveTypeInNamespace | Aaron Kennedy | 2010-05-20 | 2 | -3/+3 |
| * | | | | | | Missing break | Aaron Kennedy | 2010-05-20 | 1 | -0/+1 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 40 | -444/+1427 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 40 | -444/+1427 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Search for QML import libraries also in application directory | Kai Koehne | 2010-05-19 | 2 | -8/+16 |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 38 | -436/+1411 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-05-19 | 13 | -176/+386 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-19 | 2 | -157/+234 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-19 | 4 | -161/+271 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | Introduce a threaded interpreter for QML binding bytecode | Aaron Kennedy | 2010-05-19 | 1 | -156/+233 |
| | | | | | * | | | | | Don't crash if the target parent is destroyed. | Martin Jones | 2010-05-19 | 1 | -1/+1 |