diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /plugins/scan | |
| 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 'plugins/scan')
| -rw-r--r-- | plugins/scan/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/scan/scan.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/scan/Makefile.am b/plugins/scan/Makefile.am index 0af404c9..84d816c8 100644 --- a/plugins/scan/Makefile.am +++ b/plugins/scan/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kofficescan.la kofficescan_la_SOURCES = scan.cpp noinst_HEADERS = scan.h -kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE) kofficescan_la_METASOURCES = AUTO diff --git a/plugins/scan/scan.h b/plugins/scan/scan.h index c872f6d3..29b100be 100644 --- a/plugins/scan/scan.h +++ b/plugins/scan/scan.h @@ -20,7 +20,7 @@ #ifndef SCAN_H #define SCAN_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <tqimage.h> class KScanDialog; |