diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /konqueror/preloader | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/preloader')
| -rw-r--r-- | konqueror/preloader/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | konqueror/preloader/preloader.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt index d8e33ef40..09dca4593 100644 --- a/konqueror/preloader/CMakeLists.txt +++ b/konqueror/preloader/CMakeLists.txt @@ -40,6 +40,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqueror_intern-static kio-shared tdeinit_kded-shared + LINK konqueror_intern-static tdeio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index 35b2352e1..aa3d97169 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -20,7 +20,7 @@ #include "preloader.h" #include "konq_settingsxt.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <dcopref.h> #include <kapplication.h> #include <dcopclient.h> |