summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qurl.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-08-14 16:27:08 +1000
committerWarwick Allison <warwick.allison@nokia.com>2009-08-14 16:27:08 +1000
commitb98b7d305ffebb700e471bd64a7dee59d947e056 (patch)
treed9520eadd17944ae9ff5e44616a695b814b085e8 /src/corelib/io/qurl.h
parent6bb93ab2fd79ae0a04c826d9027503b644b6e374 (diff)
QT_NO_URL_CAST_FROM_STRING, like QT_NO_CAST_FROM_ASCII
Diffstat (limited to 'src/corelib/io/qurl.h')
-rw-r--r--src/corelib/io/qurl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index f72c45de6..479c8b39d 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 QT_NO_URL_CAST_FROM_STRING
+ explicit
+#endif
QUrl(const QString &url);
QUrl(const QString &url, ParsingMode mode);
// ### Qt 5: merge the two constructors, with mode = TolerantMode
QUrl(const QUrl &copy);
QUrl &operator =(const QUrl &copy);
+#ifndef QT_NO_URL_CAST_FROM_STRING
QUrl &operator =(const QString &url);
+#endif
~QUrl();
void setUrl(const QString &url);