From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 03:46:01 +0000
Subject: kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 interfaces/kimproxy/library/Makefile.am               | 2 +-
 interfaces/kmediaplayer/Makefile.am                   | 2 +-
 interfaces/kmediaplayer/kfileaudiopreview/Makefile.am | 2 +-
 interfaces/kscript/Makefile.am                        | 2 +-
 interfaces/kscript/sample/Makefile.am                 | 2 +-
 interfaces/ktexteditor/Makefile.am                    | 2 +-
 interfaces/terminal/kde_terminal_interface.h          | 2 ++
 7 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'interfaces')

diff --git a/interfaces/kimproxy/library/Makefile.am b/interfaces/kimproxy/library/Makefile.am
index 36cb7ea30..17ff95343 100644
--- a/interfaces/kimproxy/library/Makefile.am
+++ b/interfaces/kimproxy/library/Makefile.am
@@ -16,7 +16,7 @@ kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
 
 lib_LTLIBRARIES =  libkimproxy.la
 libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO)
+libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI)
 libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
 
 kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
diff --git a/interfaces/kmediaplayer/Makefile.am b/interfaces/kmediaplayer/Makefile.am
index 11838080a..9819f9040 100644
--- a/interfaces/kmediaplayer/Makefile.am
+++ b/interfaces/kmediaplayer/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkmediaplayer.la
 
 libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
 libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
+libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
 libkmediaplayer_la_METASOURCES = AUTO
 
 kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
index 3eb9b5da8..a40cff821 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
 
 kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
 kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO)
+kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 
 noinst_HEADERS = kfileaudiopreview.h
 
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
index a84d73863..41cf60792 100644
--- a/interfaces/kscript/Makefile.am
+++ b/interfaces/kscript/Makefile.am
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = libkscript.la
 
 libkscript_la_SOURCES = scriptmanager.cpp
 libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO)
+libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
 kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
 kscriptincludedir = $(includedir)
diff --git a/interfaces/kscript/sample/Makefile.am b/interfaces/kscript/sample/Makefile.am
index 96e8f0873..8781a41fb 100644
--- a/interfaces/kscript/sample/Makefile.am
+++ b/interfaces/kscript/sample/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libshellscript.la
 
 libshellscript_la_SOURCES = shellscript.cpp
 libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la
+libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 
 
 METASOURCES = AUTO
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am
index 5a173b447..97ae82e2d 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/ktexteditor/Makefile.am
@@ -23,7 +23,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
 
 
 libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kabc/libkabc.la
+libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
 
 ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 1abf297e0..a60c2d70c 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -163,6 +163,8 @@ public:
      start another program instead or close it yourself.
   */
   virtual void setAutoDestroy(bool enabled) = 0;
+
+  virtual bool setPtyFd(int master_pty) = 0;
 };
 
 #endif
-- 
cgit v1.2.1