summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-19 11:42:06 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-21 13:21:22 (GMT)
commit9025b909da8e52c700b0e0ac2f62bf441233c8c5 (patch)
tree1172806a48eaddfbd5826adbad8adf23a725efc9
parentcb64ac587249f5dc6563a035e2ef5a3ad2bc5d13 (diff)
downloadQt-9025b909da8e52c700b0e0ac2f62bf441233c8c5.zip
Qt-9025b909da8e52c700b0e0ac2f62bf441233c8c5.tar.gz
Qt-9025b909da8e52c700b0e0ac2f62bf441233c8c5.tar.bz2
Fix compilation of QHash<QUrl, ...> with xlC 7.
Make sure that the function is found properly. It can't be static, for whatever reason. Reviewed-By: Peter Hartmann
-rw-r--r--src/xmlpatterns/type/qprimitives_p.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index 78bd4ae..b77698a 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -74,17 +74,6 @@ QT_BEGIN_NAMESPACE
class QString;
/**
- * @internal
- *
- * A method to allow a QHash or QSet with QUrl
- * as key type.
- */
-inline uint qHash(const QUrl &uri)
-{
- return qHash(uri.toString());
-}
-
-/**
* @short The namespace for the internal API of QtXmlPatterns
* @internal
*/
@@ -92,6 +81,17 @@ namespace QPatternist
{
/**
+ * @internal
+ *
+ * A method to allow a QHash or QSet with QUrl
+ * as key type.
+ */
+ inline uint qHash(const QUrl &uri)
+ {
+ return qHash(uri.toString());
+ }
+
+ /**
* @defgroup Patternist_cppWXSTypes C++ Primitives for W3C XML Schema Number Types
*
* The implementations of W3C XML Schema's(WXS) number types, more specifically
@@ -208,6 +208,8 @@ namespace QPatternist
QString Q_AUTOTEST_EXPORT escape(const QString &input);
}
+using QPatternist::qHash;
+
QT_END_NAMESPACE
QT_END_HEADER