[kdeplasma-addons] applets: Merge branch 'quickshare-purpose'

[Aleix Pol]

Git commit 05e73ab3e822d49bf57e902fd545c5ab6fd0c510 by Aleix Pol.
Committed on 05/03/2015 at 14:37.
Pushed by apol into branch 'master'.

Merge branch 'quickshare-purpose'

Merge the new version of the QuickShare plasmoid, now it depends on the
experimental and un-released Purpose framework. (In contrast to being
commented-out).

Feedback is very welcome.

Okay'ed by David Edmundson.

CCMAIL: plasma-devel at kde.org

M  +10   -1    applets/CMakeLists.txt
M  +1    -0    applets/quickshare/plasmoid/metadata.desktop

http://commits.kde.org/kdeplasma-addons/05e73ab3e822d49bf57e902fd545c5ab6fd0c510

diff --cc applets/CMakeLists.txt
index 0837e73,6796da1..fcd0209
--- a/applets/CMakeLists.txt
+++ b/applets/CMakeLists.txt
@@@ -13,10 -23,9 +23,9 @@@ add_subdirectory(showdesktop
  
  plasma_install_package(webbrowser org.kde.plasma.webbrowser)
  
 -
 +add_subdirectory(comic)
  # This plasmoid is disabled because although ported it does not actually work on Qt5.3
  # Re-enable in Plasma 5.2 AFTER testing drag & drop
- # plasma_install_package(quickshare org.kde.plasma.quickshare)
  
  #This applet is disabled because although ported it does not work
  # add_subdirectory(eyes)