diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:32 -0600 |
| commit | a85b4f75f4b18088b828cacd85bc956841d9d32d (patch) | |
| tree | 278916272bb9626268bc2c1a975e7a59621e4a34 /configdialog | |
| parent | daaefa882442ed0b524efb36a099cdfb2a4ecc37 (diff) | |
| download | kbfx-a85b4f75f4b18088b828cacd85bc956841d9d32d.tar.gz kbfx-a85b4f75f4b18088b828cacd85bc956841d9d32d.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'configdialog')
| -rw-r--r-- | configdialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configdialog/kbfxconfigapp.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configdialog/CMakeLists.txt b/configdialog/CMakeLists.txt index 20ff4cc..b8ee279 100644 --- a/configdialog/CMakeLists.txt +++ b/configdialog/CMakeLists.txt @@ -36,7 +36,7 @@ tde_add_executable( kbfxconfigapp AUTOMOC kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui kbfxconfigdlglayout.ui - LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared kio-shared khtml-shared + LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared kio-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index c3502cb..985daac 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -47,8 +47,8 @@ #include <kcombobox.h> #include <kdebug.h> #include <kfiledialog.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kicondialog.h> #include <kio/job.h> #include <kio/netaccess.h> |