author | zautrix <zautrix> | 2005-10-27 10:46:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-27 10:46:00 (UTC) |
commit | f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8 (patch) (side-by-side diff) | |
tree | 3b0647f6b8d5a411d33d128b7365c99d3cb52850 | |
parent | 29c7448b3c54e8d579732d10f144e12f7167c3c3 (diff) | |
download | kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.zip kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.gz kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.bz2 |
commit
-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 @@ -5,12 +5,13 @@ 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 = \ 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 @@ -51,18 +51,19 @@ $Id$ #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; 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 @@ -142,13 +142,13 @@ Factory::Factory( const QString& resourceFamily) : 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 ); } } diff --git a/variables.pri b/variables.pri index 9975cf0..5d3b6cb 100644 --- a/variables.pri +++ b/variables.pri @@ -4,11 +4,11 @@ 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 |