Index: cmake/modules/FindDBusMenuQt.cmake
===================================================================
--- cmake/modules/FindDBusMenuQt.cmake	(Revision 1118962)
+++ cmake/modules/FindDBusMenuQt.cmake	(Arbeitskopie)
@@ -24,6 +24,7 @@
     # in cache already
     set(DBUSMENUQT_FOUND TRUE)
 else (DBUSMENUQT_INCLUDE_DIR AND DBUSMENUQT_LIBRARIES)
+    set(DBUSMENUQT_FOUND TRUE)
     if (NOT WIN32)
         find_package(PkgConfig)
         pkg_check_modules(PC_DBUSMENUQT QUIET dbusmenu-qt)
Index: kfile/kfileplacesmodel.cpp
===================================================================
--- kfile/kfileplacesmodel.cpp	(Revision 1118962)
+++ kfile/kfileplacesmodel.cpp	(Arbeitskopie)
@@ -513,7 +513,7 @@
 
 static QString _k_internalMimetype(const KFilePlacesModel * const self)
 {
-    return QString("application/x-kfileplacesmodel-")+QString::number((long)self);
+    return QString("application/x-kfileplacesmodel-")+QString::number((intptr_t)self);
 }
 
 QStringList KFilePlacesModel::mimeTypes() const
Index: kio/kio/job.cpp
===================================================================
--- kio/kio/job.cpp	(Revision 1118962)
+++ kio/kio/job.cpp	(Arbeitskopie)
@@ -449,7 +449,7 @@
 
     if (ui() && ui()->window())
     {
-        m_outgoingMetaData.insert("window-id", QString::number((long)ui()->window()->winId()));
+        m_outgoingMetaData.insert("window-id", QString::number((intptr_t)ui()->window()->winId()));
     }
 
     if (ui() && ui()->userTimestamp())
Index: kio/kio/global.h
===================================================================
--- kio/kio/global.h	(Revision 1118962)
+++ kio/kio/global.h	(Arbeitskopie)
@@ -35,9 +35,9 @@
 
 #include <kjob.h>
 
-#ifdef Q_OS_WIN
-template class KDE_EXPORT QMap<QString, QString>;
-#endif
+//#ifdef Q_OS_WIN
+//template class KDE_EXPORT QMap<QString, QString>;
+//#endif
 
 class KUrl;
 class KJobTrackerInterface;
Index: kio/kssl/kopenssl.h
===================================================================
--- kio/kssl/kopenssl.h	(Revision 1118962)
+++ kio/kssl/kopenssl.h	(Arbeitskopie)
@@ -30,6 +30,9 @@
 #include <ksslconfig.h>
 
 #ifdef KSSL_HAVE_SSL
+#ifdef Q_WS_WIN
+#include <windows.h>
+#endif
 #define crypt _openssl_crypt
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -52,6 +55,10 @@
 #define OSSL_SKVALUE_RTYPE char
 #define OSSL_MORECONST
 #endif
+#ifdef Q_WS_WIN
+#undef X509_NAME
+typedef struct X509_name_st X509_NAME;
+#endif
 #endif
 
 /**
Index: kdecore/network/k3socketaddress.cpp
===================================================================
--- kdecore/network/k3socketaddress.cpp	(Revision 1118962)
+++ kdecore/network/k3socketaddress.cpp	(Arbeitskopie)
@@ -231,7 +231,7 @@
 // useful definitions
 #define MIN_SOCKADDR_LEN	sizeof(quint16)
 #define SOCKADDR_IN_LEN		sizeof(sockaddr_in)
-#define MIN_SOCKADDR_IN6_LEN	((unsigned long) &(((our_sockaddr_in6*)0)->sin6_scope_id))
+#define MIN_SOCKADDR_IN6_LEN	((uintptr_t) &(((our_sockaddr_in6*)0)->sin6_scope_id))
 #define SOCKADDR_IN6_LEN	sizeof(our_sockaddr_in6)
 #define MIN_SOCKADDR_UN_LEN	(sizeof(quint16) + sizeof(char))
 
Index: kdecore/util/kallocator.cpp
===================================================================
--- kdecore/util/kallocator.cpp	(Revision 1118962)
+++ kdecore/util/kallocator.cpp	(Arbeitskopie)
@@ -114,10 +114,10 @@
 
 void KZoneAllocator::insertHash(MemBlock *b)
 {
-  unsigned long adr = ((unsigned long)b->begin) & (~(d->blockSize - 1));
-  unsigned long end = ((unsigned long)b->begin) + d->blockSize;
+  uintptr_t adr = ((uintptr_t)b->begin) & (~(d->blockSize - 1));
+  uintptr_t end = ((uintptr_t)b->begin) + d->blockSize;
   while (adr < end) {
-    unsigned long key = adr >> d->log2;
+    uintptr_t key = adr >> d->log2;
     key = key & (d->hashSize - 1);
     if (!d->hashList[key])
       d->hashList[key] = new QList<MemBlock *>;
@@ -182,10 +182,10 @@
   /* Update also the hashlists if we aren't going to reconstruct them
      soon.  */
   if (d->hashList && !d->hashDirty) {
-    unsigned long adr = ((unsigned long)b->begin) & (~(d->blockSize - 1));
-    unsigned long end = ((unsigned long)b->begin) + d->blockSize;
+    uintptr_t adr = (( uintptr_t )b->begin) & (~(d->blockSize - 1));
+    uintptr_t end = (( uintptr_t )b->begin) + d->blockSize;
     while (adr < end) {
-      unsigned long key = adr >> d->log2;
+      uintptr_t key = adr >> d->log2;
       key = key & (d->hashSize - 1);
       if (d->hashList[key]) {
 	QList<MemBlock *> *list = d->hashList[key];
@@ -241,7 +241,7 @@
   if (d->hashDirty)
     initHash();
 
-  unsigned long key = (((unsigned long)ptr) >> d->log2) & (d->hashSize - 1);
+  uintptr_t key = (((uintptr_t)ptr) >> d->log2) & (d->hashSize - 1);
   const QList<MemBlock *> *list = d->hashList[key];
   if (!list) {
     /* Can happen with certain usage pattern of intermixed free_since()
Index: khtml/misc/arena.h
===================================================================
--- khtml/misc/arena.h	(Revision 1118962)
+++ khtml/misc/arena.h	(Arbeitskopie)
@@ -40,6 +40,7 @@
 #define ARENA_H
 
 #include <config-khtml.h>
+#include <stdint.h>
 
 // VG annotations for arenas disabled since still buggy
 #if 0 && defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG)
@@ -59,7 +60,7 @@
 
 #define ARENA_ALIGN_MASK 3
 
-typedef unsigned long uword;
+typedef uintptr_t uword;
 
 namespace khtml {
 
