diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:08 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:08 (GMT) |
| commit | e50e811461b54e07184af547f62aa44b3c5bb681 (patch) | |
| tree | 45541bc05471d6c49305afeafa13f69031ccdecd /src/corelib/io/qurl.h | |
| parent | 05b65c2f9df1c2c56c72f313401a6adb422d381b (diff) | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
| download | Qt-e50e811461b54e07184af547f62aa44b3c5bb681.zip Qt-e50e811461b54e07184af547f62aa44b3c5bb681.tar.gz Qt-e50e811461b54e07184af547f62aa44b3c5bb681.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qfontengine_mac.mm
src/gui/text/qfontengine_p.h
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 563be5f..63fe98d 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -100,6 +100,8 @@ public: #endif ~QUrl(); + inline void swap(QUrl &other) { qSwap(d, other.d); } + void setUrl(const QString &url); void setUrl(const QString &url, ParsingMode mode); // ### Qt 5: merge the two setUrl() functions, with mode = TolerantMode |