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/viewplugins/imagesize | |
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/viewplugins/imagesize')
-rw-r--r-- | chalk/plugins/viewplugins/imagesize/Makefile.am | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/imagesize/imagesize.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am index 73a096be..fc2fbd0d 100644 --- a/chalk/plugins/viewplugins/imagesize/Makefile.am +++ b/chalk/plugins/viewplugins/imagesize/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h kde_module_LTLIBRARIES = chalkimagesize.la -chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h index f69759a0..c91c7905 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/imagesize.h @@ -20,7 +20,7 @@ #ifndef IMAGESIZE_H #define IMAGESIZE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; class KisPainter; |