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/separate_channels | |
| 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/separate_channels')
| -rw-r--r-- | chalk/plugins/viewplugins/separate_channels/Makefile.am | 2 | ||||
| -rw-r--r-- | chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am index ce279a13..5237ce41 100644 --- a/chalk/plugins/viewplugins/separate_channels/Makefile.am +++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \ kde_services_DATA = chalkseparatechannels.desktop -chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index cd0e9a77..2190957d 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SEPARATE_CHANNELS_PLUGIN_H_ #define _KIS_SEPARATE_CHANNELS_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; |