diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-08-09 14:03:42 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-08-09 14:03:42 +1000 |
| commit | 6921544e7706e7c69dc56ff62f64791f6011c63f (patch) | |
| tree | 518032b0626eab4b678033fdb11ebd254ca29a06 | |
| parent | b2ac0c933bb27e44006c469975b63df32962a3ed (diff) | |
Fix symbian compilation.
The define is QT_NO_QFUTURE not QT_NO_FUTURE.
| -rw-r--r-- | examples/mediabrowser/coverartmodel.cpp | 2 | ||||
| -rw-r--r-- | examples/mediabrowser/coverartmodel.h | 2 | ||||
| -rw-r--r-- | examples/mediabrowser/thumbnailmodel.cpp | 2 | ||||
| -rw-r--r-- | examples/mediabrowser/thumbnailmodel.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/examples/mediabrowser/coverartmodel.cpp b/examples/mediabrowser/coverartmodel.cpp index ccd82260af..29739da802 100644 --- a/examples/mediabrowser/coverartmodel.cpp +++ b/examples/mediabrowser/coverartmodel.cpp @@ -58,6 +58,7 @@ CoverArtModel::CoverArtModel(QAbstractGallery *gallery, QObject *parent) { } +#ifndef QT_NO_QFUTURE #if defined(Q_OS_UNIX) && !(defined(Q_OS_SYMBIAN) || defined(Q_OS_MAC)) QString CoverArtModel::imagePath(const QModelIndex &index) const { @@ -85,3 +86,4 @@ QString CoverArtModel::hash(const QString &identifier) const } } #endif +#endif diff --git a/examples/mediabrowser/coverartmodel.h b/examples/mediabrowser/coverartmodel.h index 502c4aa541..7e1926a537 100644 --- a/examples/mediabrowser/coverartmodel.h +++ b/examples/mediabrowser/coverartmodel.h @@ -53,6 +53,7 @@ class CoverArtModel : public ThumbnailModel public: CoverArtModel(QAbstractGallery *gallery, QObject *parent = 0); +#ifndef QT_NO_QFUTURE #if defined(Q_OS_UNIX) && !(defined(Q_OS_SYMBIAN) || defined(Q_OS_MAC)) protected: QString imagePath(const QModelIndex &index) const; @@ -63,6 +64,7 @@ private: QRegExp illegalCharacters; QString whitespace; #endif +#endif }; #endif diff --git a/examples/mediabrowser/thumbnailmodel.cpp b/examples/mediabrowser/thumbnailmodel.cpp index 4900d6ba9e..b880faef1a 100644 --- a/examples/mediabrowser/thumbnailmodel.cpp +++ b/examples/mediabrowser/thumbnailmodel.cpp @@ -61,7 +61,7 @@ ThumbnailModel::~ThumbnailModel() { } -#ifndef QT_NO_FUTURE +#ifndef QT_NO_QFUTURE QVariant ThumbnailModel::data(const QModelIndex &index, int role) const { diff --git a/examples/mediabrowser/thumbnailmodel.h b/examples/mediabrowser/thumbnailmodel.h index d9c086bf81..574f22c28e 100644 --- a/examples/mediabrowser/thumbnailmodel.h +++ b/examples/mediabrowser/thumbnailmodel.h @@ -57,7 +57,7 @@ public: ThumbnailModel(QAbstractGallery *gallery, QObject *parent = 0); ~ThumbnailModel(); -#ifndef QT_NO_FUTURE +#ifndef QT_NO_QFUTURE QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; protected: |