summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 17:33:10 (UTC)
committer zautrix <zautrix>2004-10-23 17:33:10 (UTC)
commit52b6fc17c0dcd1f13f701f698e0305440f26fc3e (patch) (side-by-side diff)
treeb8d374e16c322f413e5809e55c45b8798190791d
parent13d274c37baaae48a1c93081077cf3035459c6a8 (diff)
downloadkdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.zip
kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.gz
kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.bz2
qtopia res windows fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/qtopia/qtopia.pro4
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp9
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp2
3 files changed, 13 insertions, 2 deletions
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 6efb678..0360abf 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -33,5 +33,9 @@ win32: {
CONFIG += dll
DEFINES += _WIN32_
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
+LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/microkabc.lib
}
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 95fa541..99e8618 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -25,9 +25,9 @@ Copyright (c) 2004 Ulf Schenk
$Id$
*/
#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
+//#include <unistd.h>
#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
@@ -51,15 +51,22 @@ $Id$
#include "resourceqtopia.h"
using namespace KABC;
+
extern "C"
+#ifdef _WIN32_
+__declspec(dllexport)
+#else
{
+#endif
void *init_microkabc_qtopia()
{
return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
}
+#ifndef _WIN32_
}
+#endif
ResourceQtopia::ResourceQtopia( const KConfig *config )
: Resource( config ), mConverter (0)
{
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index 0505d0b..d5d6141 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -32,9 +32,9 @@ $Id$
#include <klocale.h>
#include <kstandarddirs.h>
#include <kdialog.h>
-#include <unistd.h>
+//#include <unistd.h>
#include <qdir.h>
#include <qfile.h>
#include "resourceqtopia.h"