author | zautrix <zautrix> | 2005-04-03 21:03:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-03 21:03:06 (UTC) |
commit | f3707f1dcc3d42d43c9e6b649a9a68b2e706051e (patch) (unidiff) | |
tree | cad8019b110d59bd76a2901494259f2971c160b7 /microkde | |
parent | 2d83daf3568bb829db2530baa917db5a4cbf0768 (diff) | |
download | kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.zip kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.gz kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.bz2 |
static fix
-rw-r--r-- | microkde/kresources/factory.cpp | 26 | ||||
-rw-r--r-- | microkde/kresources/managerimpl.cpp | 2 | ||||
-rw-r--r-- | microkde/microkde.pro | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index a3b7fff..5fbfa68 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp | |||
@@ -36,2 +36,7 @@ | |||
36 | 36 | ||
37 | #ifdef STATIC_RESOURCES | ||
38 | #include <file/resourcefile.h> | ||
39 | #include <dir/resourcedir.h> | ||
40 | #include <qtopia/resourceqtopia.h> | ||
41 | #endif | ||
37 | using namespace KRES; | 42 | using namespace KRES; |
@@ -221,2 +226,21 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) | |||
221 | 226 | ||
227 | #ifdef STATIC_RESOURCES | ||
228 | qDebug("NEW STATIC RESOURCE %s", type.latin1()); | ||
229 | Resource *resource = 0; | ||
230 | if ( type == "file" ) { | ||
231 | resource = (Resource *) new KABC::ResourceFile( config ); | ||
232 | } else if ( type == "dir" ) { | ||
233 | resource = new KABC::ResourceDir( config ); | ||
234 | } else if ( type == "qtopia" ) { | ||
235 | resource = new KABC::ResourceQtopia( config ); | ||
236 | } | ||
237 | if ( !resource) | ||
238 | qDebug("Factory::resource:: resources are statically linked. resource type %s is not supported ",type.latin1() ); | ||
239 | else | ||
240 | resource->setType( type ); | ||
241 | return resource; | ||
242 | #else | ||
243 | |||
244 | |||
245 | |||
222 | /*US load the lib not dynamicly. !! | 246 | /*US load the lib not dynamicly. !! |
@@ -255,2 +279,4 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) | |||
255 | return resource; | 279 | return resource; |
280 | |||
281 | #endif | ||
256 | } | 282 | } |
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 566b8f4..a6d2007 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp | |||
@@ -42,2 +42,4 @@ $Id$ | |||
42 | 42 | ||
43 | |||
44 | |||
43 | using namespace KRES; | 45 | using namespace KRES; |
diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 9016260..783ec34 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro | |||
@@ -2,2 +2,3 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | include( ../variables.pri ) | ||
3 | #INCLUDEPATH += $(QTDIR)/include . | 4 | #INCLUDEPATH += $(QTDIR)/include . |
@@ -11,2 +12,8 @@ DEFINES += DESKTOP_VERSION KDE_QT_ONLY | |||
11 | unix : { | 12 | unix : { |
13 | staticlib: { | ||
14 | INCLUDEPATH += ../kabc/plugins | ||
15 | DEFINES += STATIC_RESOURCES | ||
16 | } | ||
17 | |||
18 | |||
12 | OBJECTS_DIR = obj/unix | 19 | OBJECTS_DIR = obj/unix |
@@ -19,3 +26,2 @@ MOC_DIR = moc/win | |||
19 | } | 26 | } |
20 | include( ../variables.pri ) | ||
21 | 27 | ||