diff options
| author | Giuseppe D'Angelo <dangelog@gmail.com> | 2012-04-04 20:19:39 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-08 18:25:04 +0200 |
| commit | 9166163f103b8ac35544270c8cf397de3416b8f0 (patch) | |
| tree | c2a6434522785bc1779182dbf77e75b5f19bf1c0 /src/corelib/io/qurl.h | |
| parent | c3b9a67cf054c71d7dd57d91220cded62256019d (diff) | |
QUrl: added two-arguments qHash support
An unnecessary #include <QHash> was also removed, and other
includes refactored.
Change-Id: Ifcd3e37d75029c142a2e55ab492b88624505670a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 5fcbbf0c0c..068fe73401 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -46,7 +46,9 @@ #include <QtCore/qbytearray.h> #include <QtCore/qobjectdefs.h> #include <QtCore/qstring.h> -#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qpair.h> +#include <QtCore/qglobal.h> QT_BEGIN_HEADER @@ -304,7 +306,7 @@ public: static QByteArray toAce(const QString &); static QStringList idnWhitelist(); static void setIdnWhitelist(const QStringList &); - friend Q_CORE_EXPORT uint qHash(const QUrl &url); + friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0); private: QUrlPrivate *d; |