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/iccconfig | |
| 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/iccconfig')
| -rw-r--r-- | kcontrol/iccconfig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.desktop | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt index de5a8905a..4af3af694 100644 --- a/kcontrol/iccconfig/CMakeLists.txt +++ b/kcontrol/iccconfig/CMakeLists.txt @@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI tde_add_kpart( kcm_iccconfig AUTOMOC SOURCES iccconfig.cpp iccconfigbase.ui iccconfig.skel - LINK kio-shared tderandr-shared + LINK tdeio-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index c65699489..a12d26b2d 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -28,7 +28,7 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop index 0ac801513..008914acb 100644 --- a/kcontrol/iccconfig/iccconfig.desktop +++ b/kcontrol/iccconfig/iccconfig.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell iccconfig +Exec=tdecmshell iccconfig Icon=background Type=Application DocPath=kcontrol/iccconfig/index.html |