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, 261 insertions, 0 deletions

diff --git a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro b/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro
new file mode 100644
index 000000000..21ab07a78
--- /dev/null
+++ b/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro
@@ -0,0 +1,17 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+
+win32 {
+	CONFIG +=console
+	CONIG -=windows
+}
+
+DESTDIR=.
+TARGET		= genembed
+
+SOURCES = \
+genembed.cpp
+
+
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
new file mode 100644
index 000000000..9245377cc
--- /dev/null
+++ b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
@@ -0,0 +1,17 @@
+include( ../../common.pro )
+
+system( bash kmoc )
+system( qmake genembed.pro -o Makefile.genembed )
+system( nmake /f Makefile.genembed clean )
+system( nmake /f Makefile.genembed )
+system( bash ./genemb.sh )
+
+TARGET		= activeheart$$KDEBUG
+
+SOURCES = \
+colorutil.cpp \
+gradients.cpp \
+activeheart.cpp \
+pixmaploader.cpp
+
+
diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/kstyles/common.pro
new file mode 100644
index 000000000..d76111c37
--- /dev/null
+++ b/win/pro_files/kstyles/common.pro
@@ -0,0 +1,12 @@
+TEMPLATE	= lib
+
+CONFIG += kstyle
+
+include( $(KDELIBS)/win/common.pro )
+
+
+# needed to export library classes:
+DEFINES += MAKE_KSTYLE_LIB 
+
+LIBS += $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX
+
diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
new file mode 100644
index 000000000..d9ca9d8c3
--- /dev/null
+++ b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
@@ -0,0 +1,10 @@
+include( ../../common.pro )
+
+TARGET		= dotnet$$KDEBUG
+
+SOURCES = \
+dotnet.cpp
+
+system( moc dotnet.h -o moc/dotnet.moc )
+
+
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/kstyles/highcolor/highcolor.pro
new file mode 100644
index 000000000..57bfca812
--- /dev/null
+++ b/win/pro_files/kstyles/highcolor/highcolor.pro
@@ -0,0 +1,10 @@
+include( ../common.pro )
+
+TARGET		= highcolor$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+highcolor.cpp
+
+
diff --git a/win/pro_files/kstyles/keramik/genembed.pro b/win/pro_files/kstyles/keramik/genembed.pro
new file mode 100644
index 000000000..21ab07a78
--- /dev/null
+++ b/win/pro_files/kstyles/keramik/genembed.pro
@@ -0,0 +1,17 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+
+win32 {
+	CONFIG +=console
+	CONIG -=windows
+}
+
+DESTDIR=.
+TARGET		= genembed
+
+SOURCES = \
+genembed.cpp
+
+
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/kstyles/keramik/keramik.pro
new file mode 100644
index 000000000..42094301c
--- /dev/null
+++ b/win/pro_files/kstyles/keramik/keramik.pro
@@ -0,0 +1,14 @@
+include( ../common.pro )
+
+TARGET		= keramik$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+colorutil.cpp \
+gradients.cpp \
+keramik.cpp \
+pixmaploader.cpp
+
+system( bash ./genemb.sh )
+
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/kstyles/klegacy/klegacy.pro
new file mode 100644
index 000000000..1f280202c
--- /dev/null
+++ b/win/pro_files/kstyles/klegacy/klegacy.pro
@@ -0,0 +1,8 @@
+include( ../common.pro )
+
+TARGET		= klegacy$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+klegacystyle.cpp
diff --git a/win/pro_files/kstyles/kstyles.pro b/win/pro_files/kstyles/kstyles.pro
new file mode 100644
index 000000000..c556acfaa
--- /dev/null
+++ b/win/pro_files/kstyles/kstyles.pro
@@ -0,0 +1,11 @@
+TEMPLATE	= subdirs
+
+SUBDIRS += \
+activeheart/widget-engine \
+plastik \
+highcolor \
+keramik \
+light \
+slickerstyle/slicker \
+dotNET/dotnet \
+thinkeramik/widget-engine
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro
new file mode 100644
index 000000000..773030b6b
--- /dev/null
+++ b/win/pro_files/kstyles/kthemestyle/themestyle.pro
@@ -0,0 +1,15 @@
+include( ../common.pro )
+
+LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX
+
+TARGET		= kthemestyle$$KDEBUG
+
+SOURCES = \
+kthemestyle.cpp \
+kthemebase.cpp \
+kstyledirs.cpp
+
+system( moc kthemestyle.h -o moc/kthemestyle.moc )
+system( moc kthemebase.h -o moc/kthemebase.moc )
+
+
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/kstyles/light/light.pro
new file mode 100644
index 000000000..025158c3a
--- /dev/null
+++ b/win/pro_files/kstyles/light/light.pro
@@ -0,0 +1,11 @@
+include( ../common.pro )
+
+TARGET		= light$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+light.cpp \
+lightstyle-v2.cpp \
+lightstyle-v3.cpp
+
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/kstyles/plastik/plastik.pro
new file mode 100644
index 000000000..51937369c
--- /dev/null
+++ b/win/pro_files/kstyles/plastik/plastik.pro
@@ -0,0 +1,9 @@
+include( ../common.pro )
+
+TARGET = plastik$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+plastik.cpp \
+misc.cpp
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
new file mode 100644
index 000000000..0f7bab178
--- /dev/null
+++ b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
@@ -0,0 +1,8 @@
+include( ../../common.pro )
+
+TARGET		= slicker$$KDEBUG
+
+system( bash kmoc )
+
+SOURCES = \
+slicker.cpp
\ No newline at end of file
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
new file mode 100644
index 000000000..37e637ed7
--- /dev/null
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
@@ -0,0 +1,26 @@
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+
+unix:LIBS += -lkdefx
+
+win32 {
+	CONFIG +=console
+	CONIG -=windows
+}
+
+DESTDIR=.
+
+
+contains( KW_CONFIG, release ) {
+TARGET		= genembed_rel
+}
+!contains( KW_CONFIG, release ) {
+TARGET		= genembed
+}
+
+SOURCES = \
+genembed.cpp
+
+
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
new file mode 100644
index 000000000..66346be7d
--- /dev/null
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -0,0 +1,50 @@
+# release version with compiled-in kdefx classes
+# this is used eg. for QT-only apps like Installer
+
+TEMPLATE	= lib
+
+unix { 
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
+	QMAKE_LFLAGS += -Wl,-rpath,.
+	DEFINES += KDEFX_EXPORT=
+}
+
+
+CONFIG += kstyle
+
+KW_CONFIG = release
+CONFIG -= debug
+CONFIG += release
+
+include( $(KDELIBS)/win/common.pro )
+
+
+LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
+
+CONFIG -= debug
+
+# needed to export library classes:
+DEFINES += MAKE_KSTYLE_LIB MAKE_KDEFX_LIB
+
+TARGET		= thinkeramik
+
+SOURCES = \
+colorutil.cpp \
+gradients.cpp \
+thinkeramik.cpp \
+pixmaploader.cpp
+
+#compile in kdefx
+SOURCES += \
+../../../kdefx/kstyle.cpp \
+../../../kdefx/kimageeffect.cpp \
+../../../kdefx/kpixmapeffect.cpp \
+../../../kdefx/kpixmap.cpp
+
+system( moc thinkeramik.h -o moc/thinkeramik.moc )
+system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc )
+
+
+system( bash ./genemb.sh )
+
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
new file mode 100644
index 000000000..41181415f
--- /dev/null
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
@@ -0,0 +1,26 @@
+include( ../../common.pro )
+
+TARGET		= thinkeramik$$KDEBUG
+
+unix { 
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
+	QMAKE_LFLAGS += -Wl,-rpath,.
+}
+
+system( bash kmoc )
+
+SOURCES = \
+colorutil.cpp \
+gradients.cpp \
+thinkeramik.cpp \
+pixmaploader.cpp
+
+contains( KW_CONFIG, release ) {
+	system( bash ./genemb.sh _rel )
+}
+
+!contains( KW_CONFIG, release ) {
+	system( bash ./genemb.sh )
+}
+