-rw-r--r-- | bin/kdepim/kaddressbook/icons22/ka24.png | bin | 0 -> 1435 bytes | |||
-rw-r--r-- | kabc/plugins/dir/dir.pro | 5 | ||||
-rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 11 | ||||
-rw-r--r-- | kabc/plugins/file/file.pro | 5 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 10 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 1 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 6 | ||||
-rw-r--r-- | microkde/kdecore/klibloader.cpp | 7 |
8 files changed, 39 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/icons22/ka24.png b/bin/kdepim/kaddressbook/icons22/ka24.png Binary files differnew file mode 100644 index 0000000..738e939 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ka24.png diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro index 3db201f..0023029 100644 --- a/kabc/plugins/dir/dir.pro +++ b/kabc/plugins/dir/dir.pro @@ -25,2 +25,3 @@ MOC_DIR = moc/unix win32: { +CONFIG += dll DEFINES += _WIN32_ @@ -28,2 +29,6 @@ OBJECTS_DIR = obj/win MOC_DIR = moc/win +LIBS += ../../../bin/microkdepim.lib +LIBS += ../../../bin/microkcal.lib +LIBS += ../../../bin/microkde.lib +LIBS += ../../../bin/microkabc.lib }
\ No newline at end of file diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index 6ea2f4b..3cb5179 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -64,3 +64,8 @@ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_dir() @@ -70,4 +75,5 @@ extern "C" } +#ifndef _WIN32_ } - +#endif @@ -124,3 +130,4 @@ ResourceDir::~ResourceDir() void ResourceDir::writeConfig( KConfig *config ) -{ +{ + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro index a5ade93..7cf7c58 100644 --- a/kabc/plugins/file/file.pro +++ b/kabc/plugins/file/file.pro @@ -26,2 +26,3 @@ MOC_DIR = moc/unix win32: { +CONFIG += dll DEFINES += _WIN32_ @@ -29,2 +30,6 @@ OBJECTS_DIR = obj/win MOC_DIR = moc/win +LIBS += ../../../bin/microkdepim.lib +LIBS += ../../../bin/microkcal.lib +LIBS += ../../../bin/microkde.lib +LIBS += ../../../bin/microkabc.lib }
\ No newline at end of file diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 4b4c935..2d20706 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -60,3 +60,8 @@ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_file() @@ -66,4 +71,5 @@ extern "C" } +#ifndef _WIN32_ } - +#endif @@ -139,2 +145,4 @@ void ResourceFile::writeConfig( KConfig *config ) { + + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index cf1fd3e..7f368eb 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -61,2 +61,3 @@ int main( int argc, char **argv ) a.setMainWidget( &m ); + m.resize (640, 480 ); m.show(); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 98b2fb2..9804e28 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -240,5 +240,5 @@ ContactListView::ContactListView(KAddressBookTableView *view, // setFrameStyle(QFrame::NoFrame); - setLineWidth ( 0 ); - setMidLineWidth ( 0 ); - setMargin ( 0 ); + //setLineWidth ( 0 ); + //setMidLineWidth ( 0 ); + //setMargin ( 0 ); #ifndef KAB_EMBEDDED diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index 9eee912..1394154 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp @@ -380,4 +380,9 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta //US in the microedition we work only with shared libraries. + if (libname.find('.', pos) < 0) { +#ifdef _WIN32_ + libname += ".dll"; +#else libname += ".so"; +#endif } @@ -394,3 +399,5 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta //US I add also the "lib" prefix. I do not how could this could have worked before without it? +#ifndef _WIN32_ libname.insert(pos, "lib"); +#endif |