diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /kdewidgets | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdewidgets')
| -rw-r--r-- | kdewidgets/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kdewidgets/Makefile.am | 2 | ||||
| -rw-r--r-- | kdewidgets/makekdewidgets.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt index d68fbd3d6..a0a6f29df 100644 --- a/kdewidgets/CMakeLists.txt +++ b/kdewidgets/CMakeLists.txt @@ -23,8 +23,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am index dc30a767a..3afb3947b 100644 --- a/kdewidgets/Makefile.am +++ b/kdewidgets/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS=. pics tests AM_CXXFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kfile $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefile $(all_includes) bin_PROGRAMS = makekdewidgets makekdewidgets_SOURCES = makekdewidgets.cpp diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index 8e2856c53..ea84c61b7 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -2,7 +2,7 @@ #include <kaboutdata.h> #include <kinstance.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmacroexpander.h> #include <kdebug.h> |