diff options
| -rw-r--r-- | examples/embedded/lightmaps/slippymap.cpp | 8 | ||||
| -rw-r--r-- | examples/embedded/lightmaps/slippymap.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index 66957bea18..038738c69e 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -53,10 +53,18 @@ #include "slippymap.h" #include "qmath.h" +#ifdef QT_NAMESPACE +QT_BEGIN_NAMESPACE +size_t qHash(const QT_NAMESPACE::QPoint& p) +#else size_t qHash(const QPoint& p) +#endif { return p.x() * 17 ^ p.y(); } +#ifdef QT_NAMESPACE +QT_END_NAMESPACE +#endif // tile size in pixels const int tdim = 256; diff --git a/examples/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h index db95ceb684..202d00c7e4 100644 --- a/examples/embedded/lightmaps/slippymap.h +++ b/examples/embedded/lightmaps/slippymap.h @@ -55,8 +55,10 @@ #include <QPixmap> #include <QUrl> +QT_BEGIN_NAMESPACE class QNetworkReply; class QPainter; +QT_END_NAMESPACE class SlippyMap: public QObject { @@ -93,4 +95,5 @@ private: QUrl m_url; }; -#endif
\ No newline at end of file +#endif + |