diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 14:07:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 14:07:49 (GMT) |
| commit | 8de2684b372e637a8e193cd5e6c459cbe343b3e5 (patch) | |
| tree | 9c683caa2e078c0dca490f250721d661ebbab832 /src/corelib | |
| parent | 0599478b270ae277121a55c6040acc15edd4d6eb (diff) | |
| parent | f2d647aa0a203e3598b37abcd69c65aec0d3ef21 (diff) | |
| download | Qt-8de2684b372e637a8e193cd5e6c459cbe343b3e5.zip Qt-8de2684b372e637a8e193cd5e6c459cbe343b3e5.tar.gz Qt-8de2684b372e637a8e193cd5e6c459cbe343b3e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index a60f206..4e580dd 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2997,7 +2997,9 @@ bool qt_check_std3rules(const QChar *uc, int len) // only LDH is present if (c == '-' || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') - || (c >= 'a' && c <= 'z')) + || (c >= 'a' && c <= 'z') + //underscore is not supposed to be allowed, but other browser accept it (QTBUG-7434) + || c == '_') continue; return false; |