2 files changed, 28 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 79cd2f03e..2841bacf0 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -4024,6 +4024,29 @@ QString QUrlPrivate::createErrorString()
 }
 
 /*!
+    \macro QT_NO_URL_CAST_FROM_STRING
+    \relates QUrl
+
+    Disables automatic conversions from QString (or char *) to QUrl.
+
+    Compiling your code with this define is useful when you have a lot of
+    code that uses QString for file names and you wish to convert it to
+    use QUrl for network transparency. In any code that uses QUrl, it can
+    help avoid missing QUrl::resolved() calls, and other misuses of
+    QString to QUrl conversions.
+
+    \oldcode
+        url = filename; // probably not what you want
+    \newcode
+        url = QUrl::fromLocalFile(filename);
+        url = baseurl.resolved(QUrl(filename));
+    \endcode
+
+    \sa QT_NO_CAST_FROM_ASCII
+*/
+
+
+/*!
     Constructs a URL by parsing \a url. \a url is assumed to be in human
     readable representation, with no percent encoding. QUrl will automatically
     percent encode all characters that are not allowed in a URL.
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);