[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd PLUGIN_MUSICSHAPE to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 19:39:53
Message-ID: E1Yd20v-0006GH-IV () scm ! kde ! org
[Download RAW message or body]

Git commit 837b692ae0884498900bf7f554781c850b33ee39 by Friedrich W. H. Kossebau.
Committed on 31/03/2015 at 19:38.
Pushed by kossebau into branch 'frameworks'.

Readd PLUGIN_MUSICSHAPE to build

M  +1    -1    CalligraProducts.cmake
M  +1    -1    plugins/musicshape/CMakeLists.txt
M  +2    -0    plugins/musicshape/MusicShapeFactory.cpp
M  +1    -0    plugins/musicshape/SimpleEntryTool.cpp
M  +2    -0    plugins/musicshape/actions/AbstractMusicAction.cpp
M  +2    -0    plugins/musicshape/actions/AbstractMusicAction.h
M  +1    -1    plugins/musicshape/tests/CMakeLists.txt

http://commits.kde.org/calligra/837b692ae0884498900bf7f554781c850b33ee39

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 18db56b..c0b1633 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -112,7 +112,7 @@ calligra_define_product(OKULAR_GENERATOR_ODT "Plugin for Okular \
adding support f  
 # more plugins
 calligra_define_product(PLUGIN_COLORENGINES "Colorengine plugins"  REQUIRES \
                LIB_CALLIGRA)
-calligra_define_product(PLUGIN_MUSICSHAPE "Music shape plugin" UNPORTED  REQUIRES \
LIB_CALLIGRA) +calligra_define_product(PLUGIN_MUSICSHAPE "Music shape plugin"  \
REQUIRES LIB_CALLIGRA)  calligra_define_product(PLUGIN_SPACENAVIGATOR "SpaceNavigator \
input plugin" UNPORTED  REQUIRES LIB_CALLIGRA)  \
calligra_define_product(PLUGIN_ARTISTICTEXTSHAPE "Artistic shape plugin" REQUIRES \
LIB_CALLIGRA)  calligra_define_product(PLUGIN_DOCKERS "Default dockers plugin" \
                REQUIRES LIB_CALLIGRA)
diff --git a/plugins/musicshape/CMakeLists.txt b/plugins/musicshape/CMakeLists.txt
index 1873c60..4ba4a98 100644
--- a/plugins/musicshape/CMakeLists.txt
+++ b/plugins/musicshape/CMakeLists.txt
@@ -94,7 +94,7 @@ ki18n_wrap_ui(musicshape_LIB_SRCS
 add_library(calligra_shape_music MODULE ${musicshape_LIB_SRCS})
 kcoreaddons_desktop_to_json(calligra_shape_music calligra_shape_music.desktop)
 
-target_link_libraries(calligra_shape_music flake)
+target_link_libraries(calligra_shape_music flake Qt5::Svg)
 install(TARGETS calligra_shape_music DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
diff --git a/plugins/musicshape/MusicShapeFactory.cpp \
b/plugins/musicshape/MusicShapeFactory.cpp index 13229b2..2f557b9 100644
--- a/plugins/musicshape/MusicShapeFactory.cpp
+++ b/plugins/musicshape/MusicShapeFactory.cpp
@@ -75,3 +75,5 @@ bool MusicShapeFactory::supports(const KoXmlElement & e, \
KoShapeLoadingContext &  Q_UNUSED(context);
     return ( e.localName() == "shape" ) && ( e.namespaceURI() == \
"http://www.calligra.org/music" );  }
+
+#include "MusicShapeFactory.moc"
diff --git a/plugins/musicshape/SimpleEntryTool.cpp \
b/plugins/musicshape/SimpleEntryTool.cpp index 4e68fdb..cb2f28b 100644
--- a/plugins/musicshape/SimpleEntryTool.cpp
+++ b/plugins/musicshape/SimpleEntryTool.cpp
@@ -27,6 +27,7 @@
 #include <kfiledialog.h>
 #include <kinputdialog.h>
 #include <kaction.h>
+#include <kurl.h>
 
 #include <KoIcon.h>
 #include <KoCanvasBase.h>
diff --git a/plugins/musicshape/actions/AbstractMusicAction.cpp \
b/plugins/musicshape/actions/AbstractMusicAction.cpp index 3e31d23..ab2f19c 100644
--- a/plugins/musicshape/actions/AbstractMusicAction.cpp
+++ b/plugins/musicshape/actions/AbstractMusicAction.cpp
@@ -19,6 +19,8 @@
 #include "AbstractMusicAction.h"
 #include "../SimpleEntryTool.h"
 
+#include <kicon.h>
+
 #include <QPainter>
 
 AbstractMusicAction::AbstractMusicAction(const KIcon& icon, const QString& text, \
                SimpleEntryTool* tool)
diff --git a/plugins/musicshape/actions/AbstractMusicAction.h \
b/plugins/musicshape/actions/AbstractMusicAction.h index d54412e..10a2c4d 100644
--- a/plugins/musicshape/actions/AbstractMusicAction.h
+++ b/plugins/musicshape/actions/AbstractMusicAction.h
@@ -27,6 +27,8 @@ namespace MusicCore {
     class Staff;
 }
 
+class KIcon;
+
 class AbstractMusicAction : public KAction
 {
     Q_OBJECT
diff --git a/plugins/musicshape/tests/CMakeLists.txt \
b/plugins/musicshape/tests/CMakeLists.txt index 024c3d3..beae67e 100644
--- a/plugins/musicshape/tests/CMakeLists.txt
+++ b/plugins/musicshape/tests/CMakeLists.txt
@@ -27,5 +27,5 @@ set( musicwidgettest_SRCS
     ../MusicStyle.cpp
 )
 
-add_executable(musicwidgettest TEST ${musicwidgettest_SRCS})
+kde4_add_executable(musicwidgettest TEST ${musicwidgettest_SRCS})
 target_link_libraries(musicwidgettest Qt5::Gui Qt5::Core)


[prev in list] [next in list] [prev in thread] [next in thread]