summaryrefslogtreecommitdiffstats
path: root/kdewidgets
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /kdewidgets
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdewidgets')
-rw-r--r--kdewidgets/CMakeLists.txt2
-rw-r--r--kdewidgets/kde.widgets2
-rw-r--r--kdewidgets/tests/test.widgets2
3 files changed, 3 insertions, 3 deletions
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index a0a6f29df..19768e7ef 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -61,6 +61,6 @@ add_custom_command( OUTPUT kdewidgets.cpp
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
)
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index c81df5394..81b5ba82a 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -272,7 +272,7 @@ Group=Display (KDE)
ConstructorArgs=(parent, 210, 16)
[KABC::LdapConfigWidget]
-IncludeFile=kabc/ldapconfigwidget.h
+IncludeFile=tdeabc/ldapconfigwidget.h
ToolTip=A widget which allows the user to set up LDAP connection parameters
Group=Input (KDE)
ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index 30758f69e..aa5ade889 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -261,7 +261,7 @@ Group=Display (KDE)
ConstructorArgs=(parent, 210, 16)
[KABC::AddressLineEdit]
-IncludeFile=kabc/addresslineedit.h
+IncludeFile=tdeabc/addresslineedit.h
ToolTip=A lineedit with LDAP and kabc completion.
Group=Input (KDE)
ConstructorArgs=(parent, true, name)