From kde-core-devel  Sun Nov 06 09:26:49 2005
From: Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date: Sun, 06 Nov 2005 09:26:49 +0000
To: kde-core-devel
Subject: [PATCH] fix for KSharedPixmap on win32 & Qt embedded
Message-Id: <436DCC59.3070702 () gmx ! de>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=113126924611005
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------enig3CF3781724F48CDD0CCA9F23"

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig3CF3781724F48CDD0CCA9F23
Content-Type: multipart/mixed;
 boundary="------------000504020100010303090103"

This is a multi-part message in MIME format.
--------------000504020100010303090103
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

On win32 and Qt embedded KSharedPixmap is just defined as KPixmap. But
because of this I get an unresolved symbol when linking against kdeui.
This patch fixes this problem and also adds krootpixmap.cpp on win32
(don't know why this was excluded on windows)

Christian

--------------000504020100010303090103
Content-Type: text/x-diff;
 name="kdeui.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="kdeui.patch"

Index: ksharedpixmap.h
===================================================================
--- ksharedpixmap.h	(revision 478091)
+++ ksharedpixmap.h	(working copy)
@@ -105,7 +105,8 @@
 };
 #else // WIN32, Qt Embedded
 // Let's simply assume KPixmap will do for now. Yes, I know that's broken.
-#define KSharedPixmap KPixmap
+class KSharedPixmap : public KPixmap
+ {};
 #endif
 
 #endif
Index: SConscript
===================================================================
--- SConscript	(revision 478091)
+++ SConscript	(working copy)
@@ -46,10 +46,8 @@
 kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
 kwhatsthismanager.cpp kiconviewsearchline.cpp
 ktoolbarlabelaction.cpp khbox.cpp kvbox.cpp kconfigdialogmanager.cpp
-kpixmapio.cpp 
+kpixmapio.cpp krootpixmap.cpp
 """
-if not env['WINDOWS']:
-	ui_files += ' krootpixmap.cpp'
 
 install_headers = """
 kprogress.h kcolordialog.h kselect.h 

--------------000504020100010303090103--

--------------enig3CF3781724F48CDD0CCA9F23
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFDbcxcnNKwkgf+zVMRAmvCAJ41NKcuxVx0KnF12SAWPhEOUQx4JgCeK+Js
NaoiCxXg85iabKS7/IpAc4Q=
=qTRU
-----END PGP SIGNATURE-----

--------------enig3CF3781724F48CDD0CCA9F23--