[kdeconnect-kde] plugins: Merge branch 'frameworks' to master

[Aleix Pol]

Git commit ccf03f16d1f8dbc41012e4295507dd6994ee19b3 by Aleix Pol.
Committed on 19/03/2015 at 16:23.
Pushed by apol into branch 'master'.

Merge branch 'frameworks' to master

The last version using qt/kde4 was moved into the kde4 branch.

CCMAIL: kdeconnect at kde.org

M  +10   -46   plugins/kdeconnect.notifyrc
M  +76   -38   plugins/share/shareplugin.cpp

http://commits.kde.org/kdeconnect-kde/ccf03f16d1f8dbc41012e4295507dd6994ee19b3

diff --cc plugins/share/shareplugin.cpp
index 88dcacf,4482376..f2a4f98
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@@ -112,10 -148,10 +148,10 @@@ bool SharePlugin::receivePackage(const 
              QDesktopServices::openUrl(QUrl::fromLocalFile(tmpFile.fileName()));
          }
      } else if (np.has("url")) {
 -        QUrl url(np.get<QString>("url"));
 +        QUrl url = QUrl::fromEncoded(np.get<QByteArray>("url"));
          QDesktopServices::openUrl(url);
      } else {
-         kDebug(debugArea()) << "Error: Nothing attached!";
+         qCDebug(KDECONNECT_PLUGIN_SHARE) << "Error: Nothing attached!";
      }
  
      return true;