diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
commit | c0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch) | |
tree | 2ba50375d78b077b266b224e4413150ef3e60a15 /lib/widgets/propeditor | |
parent | 33d15e862e09fbcbb05e209f832414bd8a01291e (diff) | |
download | tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'lib/widgets/propeditor')
-rw-r--r-- | lib/widgets/propeditor/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/ppixmapedit.cpp | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/purledit.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt index 08a1b665..2620aaa0 100644 --- a/lib/widgets/propeditor/CMakeLists.txt +++ b/lib/widgets/propeditor/CMakeLists.txt @@ -54,6 +54,6 @@ tde_add_library( kdevpropertyeditor SHARED AUTOMOC pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp qeditlistbox.cpp VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index bd8af048..e7980d66 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -33,7 +33,7 @@ #endif #ifndef PURE_QT -#include <kfiledialog.h> +#include <tdefiledialog.h> #else #include <tqfiledialog.h> #endif diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index 88435a40..bed86853 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -23,7 +23,7 @@ #include "propertywidget.h" #ifndef PURE_QT -#include <kfile.h> +#include <tdefile.h> class KURLRequester; #else #include <klineedit.h> |