From d353ec997f06891455dce9b51333687da670a03e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 15 May 2018 11:27:15 +0200 Subject: Use QUrl for paths so windows gets it as well --- framework/src/accounts/accountfactory.cpp | 4 ++-- framework/src/accounts/accountfactory.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/framework/src/accounts/accountfactory.cpp b/framework/src/accounts/accountfactory.cpp index 5d3c35fc..7f3f046d 100644 --- a/framework/src/accounts/accountfactory.cpp +++ b/framework/src/accounts/accountfactory.cpp @@ -68,8 +68,8 @@ void AccountFactory::loadPackage() if (pluginPath.isEmpty()) { qWarning() << "Failed to load account package: " << "org.kube.accounts." + mAccountType; } else { - mUiPath = pluginPath + "/AccountSettings.qml"; - mLoginUi = pluginPath + "/Login.qml"; + mUiPath = QUrl::fromLocalFile(pluginPath + "/AccountSettings.qml"); + mLoginUi = QUrl::fromLocalFile(pluginPath + "/Login.qml"); if (QFileInfo::exists(pluginPath + "/metadata.json")) { QFile file{pluginPath + "/metadata.json"}; file.open(QIODevice::ReadOnly); diff --git a/framework/src/accounts/accountfactory.h b/framework/src/accounts/accountfactory.h index 34293bb2..10acfbc1 100644 --- a/framework/src/accounts/accountfactory.h +++ b/framework/src/accounts/accountfactory.h @@ -22,6 +22,7 @@ #include "kube_export.h" #include #include +#include /** * A factory to instantiate account-plugins. @@ -31,8 +32,8 @@ class KUBE_EXPORT AccountFactory : public QObject Q_OBJECT Q_PROPERTY(QString accountId MEMBER mAccountId WRITE setAccountId); Q_PROPERTY(QString accountType MEMBER mAccountType WRITE setAccountType); - Q_PROPERTY(QString uiPath MEMBER mUiPath NOTIFY accountLoaded); - Q_PROPERTY(QString loginUi MEMBER mLoginUi NOTIFY accountLoaded); + Q_PROPERTY(QUrl uiPath MEMBER mUiPath NOTIFY accountLoaded); + Q_PROPERTY(QUrl loginUi MEMBER mLoginUi NOTIFY accountLoaded); Q_PROPERTY(bool requiresKeyring MEMBER mRequiresKeyring NOTIFY accountLoaded); public: explicit AccountFactory(QObject *parent = Q_NULLPTR); @@ -46,8 +47,8 @@ signals: private: void loadPackage(); QString mAccountId; - QString mUiPath; - QString mLoginUi; + QUrl mUiPath; + QUrl mLoginUi; QByteArray mAccountType; bool mRequiresKeyring = true; }; -- cgit v1.2.3