Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 300 insertions, 0 deletions

diff --git a/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
new file mode 100644
index 000000000..d74a769a8
--- /dev/null
+++ b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
@@ -0,0 +1,37 @@
+TEMPLATE	= lib
+
+include( $(KDELIBS)/win/common.pro )
+
+DEFINES += ICE_t TRANS_SERVER TRANS_CLIENT SOCKCONN TCPCONN ANSICPP
+
+TARGET = kdeice$$KDEBUG$(KDE_VER)
+
+system( bash kmoc )
+
+DEF_FILE = kde-ice.def
+
+CONFIG += no_precompile_header console
+CONFIG	-= dll 
+CONFIG	+= staticlib
+
+SOURCES	+= iceauth.c \
+			process.c \
+			accept.c \
+			authutil.c \
+			connect.c \
+			error.c \
+			getauth.c \
+			globals.c \
+			listen.c \
+			listenwk.c \
+			locking.c \
+			misc.c \
+			ping.c \
+			protosetup.c \
+			register.c \
+			replywait.c \
+			setauth.c \
+			shutdown.c \
+			transport.c \
+			watch.c
+
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
new file mode 100644
index 000000000..4df64db5b
--- /dev/null
+++ b/win/pro_files/dcop/client/client.pro
@@ -0,0 +1,18 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+#DEFINES += MAKE_DCOP_LIB
+
+DEFINES += KDECORE_EXPORT=
+
+TARGET		= dcopclient
+
+#system( bash kmoc .. )
+
+#INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES = dcopclient.c
diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro
new file mode 100644
index 000000000..99911eedb
--- /dev/null
+++ b/win/pro_files/dcop/client/dcop/dcop.pro
@@ -0,0 +1,18 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+#DEFINES += MAKE_DCOP_LIB
+
+DEFINES += KDECORE_EXPORT=
+
+TARGET		= dcop
+
+#system( bash kmoc .. )
+
+#INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= ../dcop.cpp
diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
new file mode 100644
index 000000000..315dcf5a2
--- /dev/null
+++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
@@ -0,0 +1,18 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+#DEFINES += MAKE_DCOP_LIB
+
+DEFINES += KDECORE_EXPORT=
+
+TARGET		= dcopfind
+
+#system( bash kmoc .. )
+
+#INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= ../dcopfind.cpp
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
new file mode 100644
index 000000000..13370884c
--- /dev/null
+++ b/win/pro_files/dcop/client/dcopref/dcopref.pro
@@ -0,0 +1,18 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+#DEFINES += MAKE_DCOP_LIB
+
+DEFINES += KDECORE_EXPORT=
+
+TARGET		= dcopref
+
+#system( bash kmoc .. )
+
+#INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= ../dcopref.c
diff --git a/win/pro_files/dcop/dcop.pro b/win/pro_files/dcop/dcop.pro
new file mode 100644
index 000000000..7758cbb7b
--- /dev/null
+++ b/win/pro_files/dcop/dcop.pro
@@ -0,0 +1,19 @@
+TEMPLATE	= lib
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+DEFINES += MAKE_DCOP_LIB
+
+TARGET		= dcop$$KDEBUG
+
+system( bash kmoc )
+
+LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
+
+SOURCES = \
+dcopref.cpp \
+dcopobject.cpp \
+dcopclient.cpp \
+dcopstub.cpp
+
diff --git a/win/pro_files/dcop/dcopidl/dcopidl.pro b/win/pro_files/dcop/dcopidl/dcopidl.pro
new file mode 100644
index 000000000..017bfa5c8
--- /dev/null
+++ b/win/pro_files/dcop/dcopidl/dcopidl.pro
@@ -0,0 +1,21 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX
+
+LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
+
+TARGET		= dcopidl
+
+DEFINES += YY_ALWAYS_INTERACTIVE
+
+SOURCES = \
+main.cpp \
+scanner.cc \
+yacc.cc
+
+HEADERS		=
diff --git a/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro
new file mode 100644
index 000000000..af8cef771
--- /dev/null
+++ b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro
@@ -0,0 +1,18 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
+
+TARGET		= dcopidl2cpp
+
+#DEFINES += YY_ALWAYS_INTERACTIVE
+
+SOURCES = \
+main.cpp \
+skel.cpp \
+stubimpl.cpp \
+stub.cpp
+
+HEADERS		=
diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro
new file mode 100644
index 000000000..46c7b31e9
--- /dev/null
+++ b/win/pro_files/dcop/dcopserver/dcopserver.pro
@@ -0,0 +1,19 @@
+TEMPLATE	= app
+
+# needed to export library classes:
+
+CONFIG += nokdecore nokdefx nokdeui
+include( $(KDELIBS)/win/common.pro )
+
+DEFINES += MAKE_DCOP_LIB 
+
+TARGET		= dcopserver
+
+system( bash kmoc .. )
+
+INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
+
+SOURCES	+= ../dcopserver.cpp \
+	../dcopsignals.cpp 
diff --git a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
new file mode 100644
index 000000000..c08d3c192
--- /dev/null
+++ b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
@@ -0,0 +1,17 @@
+TEMPLATE	= app
+
+CONFIG += nokdecore nokdefx nokdeui
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+DEFINES += MAKE_DCOP_LIB
+
+TARGET		= dcopserver_shutdown
+
+system( bash kmoc .. )
+
+INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
+
+SOURCES = ../dcopserver_shutdown_win.cpp
diff --git a/win/pro_files/dcop/iceauth/iceauth.pro b/win/pro_files/dcop/iceauth/iceauth.pro
new file mode 100644
index 000000000..b5c2bdf3b
--- /dev/null
+++ b/win/pro_files/dcop/iceauth/iceauth.pro
@@ -0,0 +1,16 @@
+TEMPLATE	= app
+
+CONFIG += nokdecore nokdefx nokdeui
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+
+LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
+
+TARGET		= iceauth
+
+SOURCES = \
+iceauth.c \
+process.c
+
+HEADERS		=
diff --git a/win/pro_files/dcop/testdcop/testdcop.pro b/win/pro_files/dcop/testdcop/testdcop.pro
new file mode 100644
index 000000000..9876e2815
--- /dev/null
+++ b/win/pro_files/dcop/testdcop/testdcop.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+
+include( $(KDELIBS)/win/common.pro )
+
+TARGET = testdcop
+DESTDIR = .
+
+system( bash kmoc .. )
+
+INCLUDEPATH += ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES = ../testdcop.cpp
diff --git a/win/pro_files/dcop/tests/build_win.sh b/win/pro_files/dcop/tests/build_win.sh
new file mode 100755
index 000000000..161bdf13f
--- /dev/null
+++ b/win/pro_files/dcop/tests/build_win.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+perl ./generate.pl < testcases || exit 1
+
+qmake dcop_test.pro -o Makefile && $MAKE || exit 1
+qmake driver.pro -o Makefile && $MAKE || exit 1
diff --git a/win/pro_files/dcop/tests/dcop_test.pro b/win/pro_files/dcop/tests/dcop_test.pro
new file mode 100644
index 000000000..4b390dd1d
--- /dev/null
+++ b/win/pro_files/dcop/tests/dcop_test.pro
@@ -0,0 +1,15 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+TARGET = dcop_test
+DESTDIR = .
+
+system( bash kmoc )
+system( bash kdcopidl )
+
+INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= test.cpp test_skel.cpp test_stub.cpp
diff --git a/win/pro_files/dcop/tests/driver.pro b/win/pro_files/dcop/tests/driver.pro
new file mode 100644
index 000000000..215a8596e
--- /dev/null
+++ b/win/pro_files/dcop/tests/driver.pro
@@ -0,0 +1,15 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+TARGET = driver
+DESTDIR = .
+
+system( bash kmoc )
+system( bash kdcopidl )
+
+INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= driver.cpp test_stub.cpp
diff --git a/win/pro_files/dcop/tests/tests.pro b/win/pro_files/dcop/tests/tests.pro
new file mode 100644
index 000000000..fd5d7cab5
--- /dev/null
+++ b/win/pro_files/dcop/tests/tests.pro
@@ -0,0 +1,31 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+# needed to export library classes:
+DEFINES += MAKE_DCOP_LIB
+
+TARGET		= testdcop
+
+system( bash kmoc .. )
+
+INCLUDEPATH += .. ../moc
+
+LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
+
+SOURCES	+= ../testdcop.cpp 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+