Disable thumbnail loading if QtConcurrent is not enabled.

6 files changed, 21 insertions, 20 deletions

diff --git a/examples/mediabrowser/albumview.cpp b/examples/mediabrowser/albumview.cpp
index 74b62f935b..feffec7549 100644
--- a/examples/mediabrowser/albumview.cpp
+++ b/examples/mediabrowser/albumview.cpp
@@ -46,19 +46,11 @@
 
 #include <qdocumentgallery.h>
 
-#if defined(Q_WS_MAEMO_5)
 #include "coverartmodel.h"
-#else
-#include "thumbnailmodel.h"
-#endif
 
 AlbumView::AlbumView(QAbstractGallery *gallery, QWidget *parent, Qt::WindowFlags flags)
     : GalleryView(parent, flags)
-#if defined(Q_WS_MAEMO_5)
     , model(new CoverArtModel(gallery))
-#else
-    , model(new QGalleryQueryModel(gallery))
-#endif
 {
     model->setRootType(QDocumentGallery::Album);
 
@@ -72,7 +64,7 @@ AlbumView::AlbumView(QAbstractGallery *gallery, QWidget *parent, Qt::WindowFlags
             << QDocumentGallery::title);
 
     QListView *view = new QListView;
-    view->setIconSize(ThumbnailModel::thumbnailSize);
+    view->setIconSize(CoverArtModel::thumbnailSize);
     view->setFlow(QListView::LeftToRight);
     view->setViewMode(QListView::IconMode);
     view->setSpacing(4);
diff --git a/examples/mediabrowser/coverartmodel.cpp b/examples/mediabrowser/coverartmodel.cpp
index b7f116daaf..0dbbce90ee 100644
--- a/examples/mediabrowser/coverartmodel.cpp
+++ b/examples/mediabrowser/coverartmodel.cpp
@@ -51,11 +51,15 @@
 
 CoverArtModel::CoverArtModel(QAbstractGallery *gallery, QObject *parent)
     : ThumbnailModel(gallery, parent)
+#if defined(Q_WS_MAEMO_5)
     , illegalCharacters(QLatin1String(QT_GALLERY_MEDIA_ART_ILLEGAL_CHARACTERS))
     , whitespace(QCryptographicHash::hash(" ", QCryptographicHash::Md5).toHex())
+#endif
 {
 }
 
+
+#if defined(Q_WS_MAEMO_5)
 QString CoverArtModel::imagePath(const QModelIndex &index) const
 {
     QString title = index.data(Qt::DisplayRole).toString();
@@ -81,3 +85,4 @@ QString CoverArtModel::hash(const QString &identifier) const
                 QCryptographicHash::Md5).toHex();
     }
 }
+#endif
diff --git a/examples/mediabrowser/coverartmodel.h b/examples/mediabrowser/coverartmodel.h
index d2329ec7bb..56cd590cd9 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);
 
+#if defined(Q_WS_MAEMO_5)
 protected:
     QString imagePath(const QModelIndex &index) const;
 
@@ -61,6 +62,7 @@ private:
 
     QRegExp illegalCharacters;
     QString whitespace;
+#endif
 };
 
 #endif
diff --git a/examples/mediabrowser/mediabrowser.pro b/examples/mediabrowser/mediabrowser.pro
index cdfedeb02d..200df3bbe5 100644
--- a/examples/mediabrowser/mediabrowser.pro
+++ b/examples/mediabrowser/mediabrowser.pro
@@ -14,6 +14,7 @@ HEADERS = \
     artistdelegate.h \
     artistview.h \
     browser.h \
+    coverartmodel.h \
     galleryview.h \
     photodelegate.h \
     photoview.h \
@@ -26,17 +27,10 @@ SOURCES = \
     artistdelegate.cpp \
     artistview.cpp \
     browser.cpp \
+    coverartmodel.cpp \
     galleryview.cpp \
     main.cpp \
     photodelegate.cpp \
     photoview.cpp \
     songview.cpp \
     thumbnailmodel.cpp
-
-maemo5 {
-    HEADERS += \
-            coverartmodel.h
-
-    SOURCES += \
-            coverartmodel.cpp
-}
diff --git a/examples/mediabrowser/thumbnailmodel.cpp b/examples/mediabrowser/thumbnailmodel.cpp
index 2f5550dea9..4900d6ba9e 100644
--- a/examples/mediabrowser/thumbnailmodel.cpp
+++ b/examples/mediabrowser/thumbnailmodel.cpp
@@ -61,6 +61,8 @@ ThumbnailModel::~ThumbnailModel()
 {
 }
 
+#ifndef QT_NO_FUTURE
+
 QVariant ThumbnailModel::data(const QModelIndex &index, int role) const
 {
     if (role == Qt::DecorationRole && index.isValid()) {
@@ -82,7 +84,9 @@ QVariant ThumbnailModel::data(const QModelIndex &index, int role) const
             cache.insert(id, future);
         }
 
-        return future->result();
+        return !future->isCanceled()
+                ? future->result()
+                : QVariant();
     } else {
         return QGalleryQueryModel::data(index, role);
     }
@@ -145,3 +149,5 @@ QImage ThumbnailModel::load(const QString &fileName)
     return reader.read();
 }
 
+#endif
+
diff --git a/examples/mediabrowser/thumbnailmodel.h b/examples/mediabrowser/thumbnailmodel.h
index 0815148522..d9c086bf81 100644
--- a/examples/mediabrowser/thumbnailmodel.h
+++ b/examples/mediabrowser/thumbnailmodel.h
@@ -52,13 +52,14 @@ class ThumbnailModel : public QGalleryQueryModel
 {
     Q_OBJECT
 public:
+    static const QSize thumbnailSize;
+
     ThumbnailModel(QAbstractGallery *gallery, QObject *parent = 0);
     ~ThumbnailModel();
 
+#ifndef QT_NO_FUTURE
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 
-    static const QSize thumbnailSize;
-
 protected:
     virtual QString imagePath(const QModelIndex &index) const;
 
@@ -70,6 +71,7 @@ private:
     static QImage load(const QString &fileName);
 
     mutable QCache<QString, QFutureWatcher<QImage> > cache;
+#endif
 };
 
 #endif