diff options
author | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /chalk/plugins/paintops | |
parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/paintops')
-rw-r--r-- | chalk/plugins/paintops/defaultpaintops/Makefile.am | 2 | ||||
-rw-r--r-- | chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am index 186d501f..b7760318 100644 --- a/chalk/plugins/paintops/defaultpaintops/Makefile.am +++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = defaultpaintops_plugin.h kis_airbrushop.h kis_brushop.h \ kde_module_LTLIBRARIES = chalkdefaultpaintops.la -chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index 647b22e8..a4f58423 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_PAINTOPS_PLUGIN_H_ #define DEFAULT_PAINTOPS_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper that adds the paintop factories to the paintop registry. |