diff options
author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/0257-qurl-validate-speedup.diff | |
parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
download | qt4-x11-debian/4.5.0-rc1-1.tar.gz |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/0257-qurl-validate-speedup.diff')
-rw-r--r-- | debian/patches/0257-qurl-validate-speedup.diff | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/debian/patches/0257-qurl-validate-speedup.diff b/debian/patches/0257-qurl-validate-speedup.diff deleted file mode 100644 index eefd01f..0000000 --- a/debian/patches/0257-qurl-validate-speedup.diff +++ /dev/null @@ -1,21 +0,0 @@ -qt-bugs@ issue : N234179 -Trolltech task ID : none -bugs.kde.org number : 174144 -applied: no -author: David Faure <faure@kde.org> (and Qt Software, independently) - -QUrl is supposed to have flags for parsing and validating a given URL only once. -However it only sets the Validated flag on error, not after successful validation. -So a valid url will be validated over and over again, every time e.g. port() or isValid() is called. - ---- a/src/corelib/io/qurl.cpp -+++ b/src/corelib/io/qurl.cpp -@@ -3440,6 +3440,8 @@ void QUrlPrivate::validate() const - that->encodedOriginal = that->toEncoded(); // may detach - parse(ParseOnly); - -+ QURL_SETFLAG(that->stateFlags, Validated); -+ - if (!isValid) - return; - |