Fix setting role names for Qt4 (Inspired by QtGrilo fixes).

[harmattan/cameraplus] / declarative / videoresolutionmodel.h

diff --git a/declarative/videoresolutionmodel.h b/declarative/videoresolutionmodel.h
index 77bd1bf..9d25967 100644 (file)
--- a/declarative/videoresolutionmodel.h
+++ b/declarative/videoresolutionmodel.h
@@ -56,8 +56,6 @@ public:
   QString aspectRatio() const;
   void setAspectRatio(const QString& aspectRatio);
 
-  QHash<int, QByteArray> roleNames() const;
-
 signals:
   void aspectRatioChanged();
 
@@ -68,7 +66,11 @@ private:
 
   QList<QtCamVideoResolution> m_resolutions;
 
+#if defined(QT5)
+  QHash<int, QByteArray> roleNames() const;
+  void setRoleNames(const QHash<int, QByteArray>& roles);
   QHash<int, QByteArray> m_roles;
+#endif
 };
 
 #endif /* VIDEO_RESOLUTION_MODEL_H */