diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:52:44 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:52:44 (GMT) |
| commit | 1c0529462067e5ae91199ff51ced56fd40244b36 (patch) | |
| tree | 0d90c973d49530719b92f64670c72f047bd39ffb /src/corelib | |
| parent | b6cf52001e6c961f78fd3ebf19f09a94ddf52a97 (diff) | |
| parent | 35521a8dac1cd10fe0e2bba9eb4df1b2a97320ef (diff) | |
| download | Qt-1c0529462067e5ae91199ff51ced56fd40244b36.zip Qt-1c0529462067e5ae91199ff51ced56fd40244b36.tar.gz Qt-1c0529462067e5ae91199ff51ced56fd40244b36.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qurl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index e9c4a8d..276872b 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -81,12 +81,17 @@ public: Q_DECLARE_FLAGS(FormattingOptions, FormattingOption) QUrl(); +#ifdef Q_EXPLICIT_URL_QSTRING_CONVERSION + explicit +#endif QUrl(const QString &url); QUrl(const QString &url, ParsingMode mode); // ### Qt 5: merge the two constructors, with mode = TolerantMode QUrl(const QUrl ©); QUrl &operator =(const QUrl ©); +#ifndef Q_EXPLICIT_URL_QSTRING_CONVERSION QUrl &operator =(const QString &url); +#endif ~QUrl(); void setUrl(const QString &url); @@ -235,7 +240,9 @@ public: { url = QString::fromLatin1(QUrl::toPercentEncoding(url).constData()); } +#ifndef Q_EXPLICIT_URL_QSTRING_CONVERSION inline QT3_SUPPORT operator QString() const { return toString(); } +#endif inline QT3_SUPPORT bool cdUp() { *this = resolved(QUrl(QLatin1String(".."))); |