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/taskbar | |
| 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/taskbar')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.desktop | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 2429b59bc..1aa7c5a17 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -28,7 +28,7 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kgenericfactory.h> #include <twin.h> diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop index 204b2e4ec..91d116d89 100644 --- a/kcontrol/taskbar/kcmtaskbar.desktop +++ b/kcontrol/taskbar/kcmtaskbar.desktop @@ -2,7 +2,7 @@ Icon=kmenu Type=Application DocPath=kcontrol/kcmtaskbar/index.html -Exec=kcmshell kcmtaskbar +Exec=tdecmshell kcmtaskbar X-TDE-Library=taskbar |