diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:51:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:51:42 -0600 |
| commit | aaf9c38f5f715b0b428cded6c660f55e3218a581 (patch) | |
| tree | 1ff265edd45da10a12fa5351ee8a0624b79be92f | |
| parent | 4ba3a204423d8721d10f5ef1065c21d55f83591d (diff) | |
| download | gtk-qt-engine-aaf9c38f5f715b0b428cded6c660f55e3218a581.tar.gz gtk-qt-engine-aaf9c38f5f715b0b428cded6c660f55e3218a581.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | kcm_gtk/kcmgtk.cpp | 2 | ||||
| -rw-r--r-- | kcm_gtk/kcmgtk.desktop | 2 | ||||
| -rw-r--r-- | src/qt_qt_wrapper.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp index 5cebe54..97c7aaf 100644 --- a/kcm_gtk/kcmgtk.cpp +++ b/kcm_gtk/kcmgtk.cpp @@ -41,7 +41,7 @@ #include <ksqueezedtextlabel.h> #include <stdlib.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstyle.h> #include <tqheader.h> #include <klistview.h> diff --git a/kcm_gtk/kcmgtk.desktop b/kcm_gtk/kcmgtk.desktop index f2d7c91..e6ea442 100644 --- a/kcm_gtk/kcmgtk.desktop +++ b/kcm_gtk/kcmgtk.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=GTK Styles and Fonts Comment=Control the style and fonts used by GTK applications -Exec=kcmshell kcmgtk +Exec=tdecmshell kcmgtk Terminal=false Icon=gnome_apps.png OnlyShowIn=TDE; diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index 0a718af..e1d6873 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -22,7 +22,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #undef signals #include <gdk/gdkx.h> |