diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 17:53:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 17:53:45 (GMT) |
| commit | c14a30a1a96007cb644b9637bcdf0e59bc7adbaa (patch) | |
| tree | 0ff5d2f4281674f0cc4725a37c5978ebc598a6b2 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 1c4846bc35613f388fda28841e19c3a9cbc8c11f (diff) | |
| parent | 1ae65ed7207711dc69bfa11fc184a8c2975eea9f (diff) | |
| download | Qt-c14a30a1a96007cb644b9637bcdf0e59bc7adbaa.zip Qt-c14a30a1a96007cb644b9637bcdf0e59bc7adbaa.tar.gz Qt-c14a30a1a96007cb644b9637bcdf0e59bc7adbaa.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Allow QTextDocument to resolve URLs to the current working dir.
Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs.""
Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to""
Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively""
Revert "Revert "Improve QUrl handling of local file paths""
Cocoa: remove warnings
Autotest, Mac: added more native key event testing
Cocoa: Glyph for "Enter" is wrong in QKeySequence
Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu bar
Cocoa: Add support for native application event filter
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions