| -rw-r--r-- | kabc/plugins/olaccess/olaccess.pro | 1 | ||||
| -rw-r--r-- | kabc/plugins/olaccess/resourceolaccess.cpp | 5 | ||||
| -rw-r--r-- | microkde/kresources/factory.cpp | 2 | ||||
| -rw-r--r-- | variables.pri | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro index 4416d0c..9b95015 100644 --- a/kabc/plugins/olaccess/olaccess.pro +++ b/kabc/plugins/olaccess/olaccess.pro @@ -3,16 +3,17 @@ CONFIG += qt warn_on TARGET = microkabc_olaccess include( ../../../variables.pri ) INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat INTERFACES = \ +DESTDIR = ../../../bin HEADERS = \ resourceolaccess.h \ resourceolaccessconfig.h \ olaccessconverter.h SOURCES = \ resourceolaccess.cpp \ resourceolaccessconfig.cpp \ diff --git a/kabc/plugins/olaccess/resourceolaccess.cpp b/kabc/plugins/olaccess/resourceolaccess.cpp index 7113e0e..c7c9874 100644 --- a/kabc/plugins/olaccess/resourceolaccess.cpp +++ b/kabc/plugins/olaccess/resourceolaccess.cpp @@ -49,22 +49,23 @@ $Id$ #include "resourceolaccess.h" #include "stdaddressbook.h" #include "olaccessconverter.h" //#define ALLOW_LOCKING using namespace KABC; extern "C" -{ +__declspec(dllexport) + void *init_microkabc_olaccess() { return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>(); } -} + Resourceolaccess::Resourceolaccess( const KConfig *config ) : Resource( config ), mConverter (0) { // we can not choose the filename. Therefore use the default to display //mAccess = 0; QString fileName;// = SlZDataBase::addressbookFileName(); init( fileName ); diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index 4843ce0..86b22b2 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp @@ -140,17 +140,17 @@ Factory::Factory( const QString& resourceFamily) : //LR add ol plugin only, if the library exists. libname = "microkabc_olaccess"; path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); if ( !path.isEmpty() ) { info = new PluginInfo; info->library = libname; - info->nameLabel = i18n( "sharp" ); + info->nameLabel = i18n( "olaccess" ); info->descriptionLabel = i18n( "Outlook Addressbook." ); mTypeMap.insert( "olaccess", info ); } } Factory::~Factory() diff --git a/variables.pri b/variables.pri index 9975cf0..5d3b6cb 100644 --- a/variables.pri +++ b/variables.pri @@ -2,13 +2,13 @@ # variables settings for compilation for Linux desktop and Qt 3.x.x unix { #for statically linking #CONFIG += staticlib } win32 { #disable importol to make it running on windows ME/98 -#CONFIG += importol +CONFIG += importol } CONFIG += thread CONFIG += release |