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 /kcontrol/css | |
| 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 'kcontrol/css')
| -rw-r--r-- | kcontrol/css/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/css/kcmcss.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/css/kcmcss.desktop | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/css/CMakeLists.txt b/kcontrol/css/CMakeLists.txt index f5410f187..56226c836 100644 --- a/kcontrol/css/CMakeLists.txt +++ b/kcontrol/css/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES template.css DESTINATION ${DATA_INSTALL_DIR}/kcmcss ) tde_add_kpart( kcm_css AUTOMOC SOURCES template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 4b1ba47ea..b35c9c04c 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -7,7 +7,7 @@ #include <kapplication.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <kfontdialog.h> #include <kgenericfactory.h> diff --git a/kcontrol/css/kcmcss.desktop b/kcontrol/css/kcmcss.desktop index d457a31b7..a8fe02b9e 100644 --- a/kcontrol/css/kcmcss.desktop +++ b/kcontrol/css/kcmcss.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=stylesheet Type=Application -Exec=kcmshell kcmcss +Exec=tdecmshell kcmcss DocPath=kcontrol/kcmcss/index.html |