Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

1 files changed, 0 insertions, 50 deletions

diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index d57a0c77df..e62cd0a85b 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -221,58 +221,8 @@ public:
     static QStringList idnWhitelist();
     static void setIdnWhitelist(const QStringList &);
 
-#if defined QT3_SUPPORT
-    inline QT3_SUPPORT QString protocol() const { return scheme(); }
-    inline QT3_SUPPORT void setProtocol(const QString &s) { setScheme(s); }
-    inline QT3_SUPPORT void setUser(const QString &s) { setUserName(s); }
-    inline QT3_SUPPORT QString user() const { return userName(); }
-    inline QT3_SUPPORT bool hasUser() const { return !userName().isEmpty(); }
-    inline QT3_SUPPORT bool hasPassword() const { return !password().isEmpty(); }
-    inline QT3_SUPPORT bool hasHost() const { return !host().isEmpty(); }
-    inline QT3_SUPPORT bool hasPort() const { return port() != -1; }
-    inline QT3_SUPPORT bool hasPath() const { return !path().isEmpty(); }
-    inline QT3_SUPPORT void setQuery(const QString &txt)
-    {
-        setEncodedQuery(txt.toLatin1());
-    }
-    inline QT3_SUPPORT QString query() const
-    {
-        return QString::fromLatin1(encodedQuery().constData());
-    }
-    inline QT3_SUPPORT QString ref() const { return fragment(); }
-    inline QT3_SUPPORT void setRef(const QString &txt) { setFragment(txt); }
-    inline QT3_SUPPORT bool hasRef() const { return !fragment().isEmpty(); }
-    inline QT3_SUPPORT void addPath(const QString &p) { setPath(path() + QLatin1Char('/') + p); }
-    QT3_SUPPORT void setFileName(const QString &txt);
-    QT3_SUPPORT QString fileName() const;
-    QT3_SUPPORT QString dirPath() const;
-    static inline QT3_SUPPORT void decode(QString &url)
-    {
-        url = QUrl::fromPercentEncoding(url.toLatin1());
-    }
-    static inline QT3_SUPPORT void encode(QString &url)
-    {
-        url = QString::fromLatin1(QUrl::toPercentEncoding(url).constData());
-    }
-    inline QT3_SUPPORT operator QString() const { return toString(); }
-    inline QT3_SUPPORT bool cdUp()
-    {
-        *this = resolved(QUrl(QLatin1String("..")));
-        return true;
-    }
-    static inline QT3_SUPPORT bool isRelativeUrl(const QString &url)
-    {
-        return QUrl(url).isRelative();
-    }
-#endif
-
     QString errorString() const;
 
-protected:
-#if defined (QT3_SUPPORT)
-    inline QT3_SUPPORT void reset() { clear(); }
-#endif
-
 private:
     QUrlPrivate *d;
 public: