Updates to qt5.

locusf · Aug 12, 2013 · b010a65 · b010a65
1 parent 0aaab2e
commit b010a65
Show file tree

Hide file tree

Showing 24 changed files with 95 additions and 66 deletions.
diff --git a/mediabox-core/contentmodel.cpp b/mediabox-core/contentmodel.cpp
@@ -43,11 +43,16 @@ content::ContentModel::ContentModel(content::ContentProvider *cp,
 
     myContentProvider->registerSource("file", new content::LocalSource);
 
-    setRoleNames(roles);
     connect(myContentProvider, SIGNAL(newFile(int,content::File::Ptr)),
             this, SLOT(handleNewFile(int,content::File::Ptr)));
 }
 
+QHash<int, QByteArray> content::ContentModel::roleNames() const {
+  QHash<int, QByteArray> roles;
+  roles[Qt::DisplayRole] = "name";
+  return roles;
+}
+
 content::ContentModel::~ContentModel()
 {
     clearFiles();
@@ -140,7 +145,7 @@ void content::ContentModel::update()
 {
     beginResetModel();
     clearFiles();
-    reset();
+    revert();
     endResetModel();
 
     myContentCookie = myContentProvider->cookie();

diff --git a/mediabox-core/contentmodel.h b/mediabox-core/contentmodel.h
@@ -63,6 +63,7 @@ class ContentModel : public QAbstractListModel
     Q_INVOKABLE QVariant getPath(int row);
     Q_INVOKABLE void update();
     int count();
+    QHash<int, QByteArray> roleNames() const;
 
     QString path();
     void setPath(QString path);

diff --git a/mediabox-core/datadirectory.cpp b/mediabox-core/datadirectory.cpp
@@ -19,16 +19,15 @@
 
 #include "datadirectory.h"
 #include <QDir>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QDebug>
 
 QString DataDirectory::Path;
 QString DataDirectory::Covers;
 
 void DataDirectory::initialize()
 {
-    QDir dataDir(
-             QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     qDebug() << "Using data location:" << dataDir.path();
     if (! dataDir.exists("mediaboxcore"))
     {

diff --git a/qml/AlbumView.qml b/qml/AlbumView.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 import "config.js" as Config
 
 Item {
@@ -84,7 +84,6 @@ Item {
             }
 
             MouseArea {
-                anchors.fill: parent
                 onClicked: {
                     console.log("clicked track" + tracksModel.count);
                     var amount = index;

diff --git a/qml/ComboBox.qml b/qml/ComboBox.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     property alias model: list.model

diff --git a/qml/Cover.qml b/qml/Cover.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 import "config.js" as Config
 
 Item {

diff --git a/qml/CoverFlow.qml b/qml/CoverFlow.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 import "config.js" as Config
 
 PathView {

diff --git a/qml/ImageButton.qml b/qml/ImageButton.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Image {
     property string source1: ""

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
@@ -1,5 +1,5 @@
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 Page {
     Rectangle {

diff --git a/qml/NowPlaying.qml b/qml/NowPlaying.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
 

diff --git a/qml/PlayerControls.qml b/qml/PlayerControls.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     property bool portrait: width < 500

diff --git a/qml/ProgressBar.qml b/qml/ProgressBar.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item {
     property double value: 0.0

diff --git a/qml/ScreenRow.qml b/qml/ScreenRow.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Item {
     property alias screen0: scr0.children

diff --git a/qml/Scrollbar.qml b/qml/Scrollbar.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 
 Rectangle {
     property variant scrollTarget

diff --git a/qml/SettingsAbout.qml b/qml/SettingsAbout.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 import "license.js" as License
 import "config.js" as Config
 

diff --git a/qml/SettingsIndexing.qml b/qml/SettingsIndexing.qml
@@ -17,8 +17,8 @@
  */
 
 
-import Qt 4.7
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 import "config.js" as Config
 

diff --git a/qml/SettingsMenu.qml b/qml/SettingsMenu.qml
@@ -17,7 +17,7 @@
  */
 
 
-import Qt 4.7
+import QtQuick 2.0
 import "config.js" as Config
 
 Rectangle {

diff --git a/qml/main.qml b/qml/main.qml
@@ -17,8 +17,8 @@
  */
 
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 PageStackWindow {
     id: appWindow

diff --git a/qmlmediaplayer.pro b/qmlmediaplayer.pro
@@ -1,5 +1,5 @@
 
-QT += core gui declarative sql dbus
+QT += core gui qml quick sql dbus multimedia widgets
 
 CONFIG += mobility
 MOBILITY += multimedia
@@ -26,4 +26,11 @@ icon.path = /usr/share/pixmaps
 icon.files = data/qmlmediaplayer.png
 
 INSTALLS += target desktop icon
-
+CONFIG += link_pkgconfig
+packagesExist(qdeclarative5-boostable) {
+    message("Building with qdeclarative5-boostable support")
+    DEFINES += HAS_BOOSTER
+    PKGCONFIG += qdeclarative5-boostable
+} else {
+    warning("qdeclarative5-boostable not available; startup times will be slower")
+}
diff --git a/rpm/qmlmusicplayer.spec b/rpm/qmlmusicplayer.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.25
+# Generated by: spectacle version 0.27
 # 
 
 Name:       qmlmusicplayer
@@ -15,17 +15,17 @@ Group:      Applications/Multimedia
 License:    GPLv2
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  qmlmusicplayer.yaml
-BuildRequires:  pkgconfig(QtDeclarative)
-BuildRequires:  pkgconfig(QtMultimediaKit)
-BuildRequires:  pkgconfig(QtOpenGL)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5OpenGL)
+BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  desktop-file-utils
 Provides:   org.pycage.musicshelf > 1.0.1
 Obsoletes:   org.pycage.musicshelf <= 1.0.1
 
 %description
 Music Player for Nemo Mobile
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -36,7 +36,7 @@ Music Player for Nemo Mobile
 # >> build pre
 # << build pre
 
-%qmake 
+%qmake5 
 
 make %{?jobs:-j%jobs}
 
@@ -47,7 +47,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 # >> install pre
 # << install pre
-%qmake_install
+%qmake5_install
 
 # >> install post
 # << install post

diff --git a/rpm/qmlmusicplayer.yaml b/rpm/qmlmusicplayer.yaml
@@ -12,8 +12,9 @@ Provides:
 Obsoletes:
     - org.pycage.musicshelf <= 1.0.1
 PkgConfigBR:
-    - QtDeclarative
-    - QtMultimediaKit
-    - QtOpenGL
+    - Qt5Quick
+    - Qt5Multimedia
+    - Qt5OpenGL
+    - Qt5DBus
 Configure: none
-Builder: qmake
+Builder: qmake5
diff --git a/src/foldermodel.cpp b/src/foldermodel.cpp
@@ -35,12 +35,13 @@ FolderModel::FolderModel(QObject *parent) :
             myFolders << finfo.fileName();
         }
     }
-
-    QHash<int, QByteArray> roles;
-    roles[Qt::DisplayRole] = "name";
-    setRoleNames(roles);
 }
 
+QHash<int, QByteArray> FolderModel::roleNames() const {
+  QHash<int, QByteArray> roles;
+  roles[Qt::DisplayRole] = "name";
+  return roles;
+}
 int FolderModel::rowCount(const QModelIndex&) const
 {
     return myFolders.size();

diff --git a/src/foldermodel.h b/src/foldermodel.h
@@ -32,7 +32,7 @@ class FolderModel : public QAbstractListModel
 
     virtual int rowCount(const QModelIndex &parent) const;
     virtual QVariant data(const QModelIndex &index, int role) const;
-
+    QHash<int, QByteArray> roleNames() const;
     Q_INVOKABLE QVariant get(int index)
     {
         return QVariant(myFolders.at(index));