[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] fix for KSharedPixmap on win32 & Qt embedded
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2005-11-06 9:26:49
Message-ID: 436DCC59.3070702 () gmx ! de
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


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

["kdeui.patch" (text/x-diff)]

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 

["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]