summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:09:56 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:09:56 +0100
commitb6dd3a3c2424fda47b78076882d432982ac4a9df (patch)
tree46916e69daf2b9553f04f0c45f8debbba788735b
parent848ba26243e5e1773bc06132635a911d42756a97 (diff)
downloadkmymoney-b6dd3a3c2424fda47b78076882d432982ac4a9df.tar.gz
kmymoney-b6dd3a3c2424fda47b78076882d432982ac4a9df.zip
Rename kdewidgets => tdewidgets
-rw-r--r--acinclude.m48
m---------admin0
m---------cmake0
-rw-r--r--kmymoney2/widgets/Makefile.am2
4 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 469e25b..d5e5f96 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -606,8 +606,8 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
- KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
- AC_SUBST(MAKEKDEWIDGETS)
+ KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
+ AC_SUBST(MAKETDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1821,7 +1821,7 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by tdelibs])
diff --git a/admin b/admin
-Subproject 9f768663f33e818a14dff26b403bae12a447a9e
+Subproject bae6da3fa84fa5d9cce73cf89968d61f1766e91
diff --git a/cmake b/cmake
-Subproject b51b691c8b18f5e7cf01689752c9b03a4212bdf
+Subproject d29f6d6b10fe1748c2a5fb1f9f2cdcecc473d35
diff --git a/kmymoney2/widgets/Makefile.am b/kmymoney2/widgets/Makefile.am
index 76cd1c7..2a9f678 100644
--- a/kmymoney2/widgets/Makefile.am
+++ b/kmymoney2/widgets/Makefile.am
@@ -58,7 +58,7 @@ libkmymoney_la_SOURCES = kmmwidgets.cpp ../kmymoneysettings.cpp kmymoneycompleti
noinst_LTLIBRARIES = libkmymoney.la
kmmwidgets.cpp: $(srcdir)/kmymoney.widgets
- $(MAKEKDEWIDGETS) -g KMyMoney -n CustomWidgetPlugin -o kmmwidgets.cpp $(abs_srcdir)/kmymoney.widgets
+ $(MAKETDEWIDGETS) -g KMyMoney -n CustomWidgetPlugin -o kmmwidgets.cpp $(abs_srcdir)/kmymoney.widgets
# make sure to compile the Qt designer version w/o the memory leak checker
# also we need a copy of the mymoneymoney.lo file which has been compiled