diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /kopete/plugins/statistics | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/statistics')
| -rw-r--r-- | kopete/plugins/statistics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/plugins/statistics/Makefile.am | 2 | ||||
| -rw-r--r-- | kopete/plugins/statistics/statisticsdialog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kopete/plugins/statistics/CMakeLists.txt b/kopete/plugins/statistics/CMakeLists.txt index 629aa9c7..3d6543a8 100644 --- a/kopete/plugins/statistics/CMakeLists.txt +++ b/kopete/plugins/statistics/CMakeLists.txt @@ -40,6 +40,6 @@ tde_add_kpart( kopete_statistics AUTOMOC SOURCES statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel - LINK kopete-shared khtml-shared ${SQLITE_LIBRARIES} + LINK kopete-shared tdehtml-shared ${SQLITE_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am index 49c24331..93a8e28a 100644 --- a/kopete/plugins/statistics/Makefile.am +++ b/kopete/plugins/statistics/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel -kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) +kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) kopete_statistics_la_LIBADD = ../../libkopete/libkopete.la -lsqlite3 service_DATA = kopete_statistics.desktop diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index a4bd07cf..ad7adb9e 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -26,7 +26,7 @@ #include "kdialogbase.h" #include "klocale.h" #include "klistview.h" -#include "khtml_part.h" +#include "tdehtml_part.h" #include "kstandarddirs.h" #include "kdatepicker.h" #include "ktimewidget.h" |