diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ find_package( Qt5 5.8.0 REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml ) find_package( Qt5 5.8.0 COMPONENTS QuickControls2 ) set_package_properties( Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" ) -find_package( KF5 REQUIRED COMPONENTS Archive Codecs CoreAddons DBusAddons Declarative DNSSD GlobalAccel GuiAddons I18n IconThemes KCMUtils KIO NewStuff Notifications NotifyConfig Package Solid TextEditor ThreadWeaver WindowSystem ) +find_package( KF5 5.41 REQUIRED COMPONENTS Archive Codecs CoreAddons DBusAddons Declarative DNSSD GlobalAccel GuiAddons I18n IconThemes KCMUtils KIO NewStuff Notifications NotifyConfig Package Solid TextEditor ThreadWeaver WindowSystem ) find_package( KF5 COMPONENTS Kirigami2 ) set_package_properties( KF5Kirigami2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" ) diff --git a/src/context/AppletModel.h b/src/context/AppletModel.h --- a/src/context/AppletModel.h +++ b/src/context/AppletModel.h @@ -41,7 +41,6 @@ Icon, Mainscript, Collapsed, - PackagePath, ContentHeight }; Q_ENUM(Role) diff --git a/src/context/AppletModel.cpp b/src/context/AppletModel.cpp --- a/src/context/AppletModel.cpp +++ b/src/context/AppletModel.cpp @@ -118,16 +118,13 @@ return package.metadata().iconName(); case Mainscript: - return QUrl::fromLocalFile(package.filePath("mainscript")); + return package.fileUrl("mainscript"); case Collapsed: return Amarok::config("Context").readEntry(package.metadata().pluginId() + "_collapsed", false); case ContentHeight: return Amarok::config("Context").readEntry(package.metadata().pluginId() + "_contentHeight", 300); - - case PackagePath: - return QVariant(package.path() + "contents/"); } return QVariant(); @@ -172,7 +169,6 @@ roles.insert(Icon, "icon"); roles.insert(Mainscript, "mainscript"); roles.insert(Collapsed, "collapsed"); - roles.insert(PackagePath, "packagePath"); roles.insert(ContentHeight, "contentHeight"); return roles; diff --git a/src/context/CMakeLists.txt b/src/context/CMakeLists.txt --- a/src/context/CMakeLists.txt +++ b/src/context/CMakeLists.txt @@ -52,4 +52,4 @@ install( FILES ${qml_plugin_qml_files} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/qml ) -kpackage_install_package( context_qml_package org.kde.amarok.context genericqml ) +kpackage_install_bundled_package( context_qml_package org.kde.amarok.context genericqml ) diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp --- a/src/context/ContextView.cpp +++ b/src/context/ContextView.cpp @@ -77,14 +77,14 @@ auto qmlPackage = KPackage::PackageLoader::self()->loadPackage( QStringLiteral( "KPackage/GenericQML" ), QStringLiteral( "org.kde.amarok.context" ) ); - Q_ASSERT( qmlPackage.isValid() ); + if( !qmlPackage.isValid() ) + ::error() << "Context QML package invalid:" << qmlPackage.path(); - const QString sourcePath = qmlPackage.filePath( "mainscript" ); - Q_ASSERT( QFile::exists( sourcePath ) ); + const QUrl sourceUrl = qmlPackage.fileUrl( "mainscript" ); - ::debug() << "Loading context qml mainscript:" << sourcePath; + ::debug() << "Loading context qml mainscript:" << sourceUrl; - setSource( QUrl::fromLocalFile( sourcePath ) ); + setSource( sourceUrl ); setResizeMode( SizeRootObjectToView ); // keep this assignment at bottom so that premature usage of ::self() asserts out @@ -176,5 +176,3 @@ } } // Context namespace - -#include diff --git a/src/context/applets/albums/CMakeLists.txt b/src/context/applets/albums/CMakeLists.txt --- a/src/context/applets/albums/CMakeLists.txt +++ b/src/context/applets/albums/CMakeLists.txt @@ -19,4 +19,4 @@ install(TARGETS amarok_context_applet_albums DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/albums) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/albums) -kpackage_install_package(package org.kde.amarok.albums amarok) +kpackage_install_bundled_package(package org.kde.amarok.albums amarok) diff --git a/src/context/applets/analyzer/CMakeLists.txt b/src/context/applets/analyzer/CMakeLists.txt --- a/src/context/applets/analyzer/CMakeLists.txt +++ b/src/context/applets/analyzer/CMakeLists.txt @@ -26,4 +26,4 @@ install(TARGETS amarok_context_applet_analyzer DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/analyzer) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/analyzer) -kpackage_install_package(package org.kde.amarok.analyzer amarok) +kpackage_install_bundled_package(package org.kde.amarok.analyzer amarok) diff --git a/src/context/applets/currenttrack/CMakeLists.txt b/src/context/applets/currenttrack/CMakeLists.txt --- a/src/context/applets/currenttrack/CMakeLists.txt +++ b/src/context/applets/currenttrack/CMakeLists.txt @@ -15,4 +15,4 @@ install(TARGETS amarok_context_applet_currenttrack DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/currenttrack) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/currenttrack) -kpackage_install_package(package org.kde.amarok.currenttrack amarok) +kpackage_install_bundled_package(package org.kde.amarok.currenttrack amarok) diff --git a/src/context/applets/lyrics/CMakeLists.txt b/src/context/applets/lyrics/CMakeLists.txt --- a/src/context/applets/lyrics/CMakeLists.txt +++ b/src/context/applets/lyrics/CMakeLists.txt @@ -14,4 +14,4 @@ install(TARGETS amarok_context_applet_lyrics DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/lyrics) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/lyrics) -kpackage_install_package(package org.kde.amarok.lyrics amarok) +kpackage_install_bundled_package(package org.kde.amarok.lyrics amarok) diff --git a/src/context/applets/photos/CMakeLists.txt b/src/context/applets/photos/CMakeLists.txt --- a/src/context/applets/photos/CMakeLists.txt +++ b/src/context/applets/photos/CMakeLists.txt @@ -14,4 +14,4 @@ install(TARGETS amarok_context_applet_photos DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/photos) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/amarok/photos) -kpackage_install_package(package org.kde.amarok.photos amarok) +kpackage_install_bundled_package(package org.kde.amarok.photos amarok) diff --git a/src/context/applets/wikipedia/CMakeLists.txt b/src/context/applets/wikipedia/CMakeLists.txt --- a/src/context/applets/wikipedia/CMakeLists.txt +++ b/src/context/applets/wikipedia/CMakeLists.txt @@ -16,4 +16,4 @@ install(FILES WikipediaCustomStyle.css bullet.gif DESTINATION ${DATA_INSTALL_DIR}/amarok/data ) -kpackage_install_package(package org.kde.amarok.wikipedia amarok) +kpackage_install_bundled_package(package org.kde.amarok.wikipedia amarok) diff --git a/src/context/context_qml_package/contents/ui/main.qml b/src/context/context_qml_package/contents/ui/main.qml --- a/src/context/context_qml_package/contents/ui/main.qml +++ b/src/context/context_qml_package/contents/ui/main.qml @@ -58,7 +58,6 @@ "iconSource": "image://icon/" + icon, "collapsed": collapsed, "contentHeight": contentHeight, - "packagePath": packagePath, "configEnabled": Qt.binding(function() { return appletToolbar.configEnabled; } ) }); } diff --git a/src/context/qml_plugin/Applet.qml b/src/context/qml_plugin/Applet.qml --- a/src/context/qml_plugin/Applet.qml +++ b/src/context/qml_plugin/Applet.qml @@ -27,7 +27,6 @@ property alias title: header.title property string name: "Nameless Applet" property string appletId - property string packagePath property url iconSource property bool collapsed: false property bool configEnabled: false