-rw-r--r-- | library/library.pro | 2 | ||||
-rw-r--r-- | library/resource.h | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/library/library.pro b/library/library.pro index 95c18a2..7143454 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -123,6 +123,8 @@ SOURCES = calendar.cpp \ | |||
123 | # Qt 3 compatibility | 123 | # Qt 3 compatibility |
124 | HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h | 124 | HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h |
125 | SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp | 125 | SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp |
126 | |||
127 | DEFINES += OPIE_INTERNAL_LIBRARY_BUILD | ||
126 | INCLUDEPATH += $(OPIEDIR)/include backend | 128 | INCLUDEPATH += $(OPIEDIR)/include backend |
127 | LIBS += -ldl -lcrypt -lm | 129 | LIBS += -ldl -lcrypt -lm |
128 | INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui | 130 | INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui |
diff --git a/library/resource.h b/library/resource.h index 4a3502a..9e4cb54 100644 --- a/library/resource.h +++ b/library/resource.h | |||
@@ -42,15 +42,22 @@ public: | |||
42 | static QStringList allSounds(); | 42 | static QStringList allSounds(); |
43 | }; | 43 | }; |
44 | 44 | ||
45 | #ifdef OPIE_INTERNAL_LIBRARY_BUILD | ||
45 | extern bool qpe_fast_findPixmap; | 46 | extern bool qpe_fast_findPixmap; |
47 | #endif | ||
48 | |||
49 | |||
46 | // Inline for compatibility with SHARP ROMs | 50 | // Inline for compatibility with SHARP ROMs |
47 | inline QIconSet Resource::loadIconSet( const QString &pix ) | 51 | inline QIconSet Resource::loadIconSet( const QString &pix ) |
48 | { | 52 | { |
53 | |||
54 | #ifdef OPIE_INTERNAL_LIBRARY_BUILD | ||
49 | /* | 55 | /* |
50 | * disable the slow load | 56 | * disable the slow load |
51 | */ | 57 | */ |
52 | bool oldMode = qpe_fast_findPixmap; | 58 | bool oldMode = qpe_fast_findPixmap; |
53 | qpe_fast_findPixmap = true; | 59 | qpe_fast_findPixmap = true; |
60 | #endif | ||
54 | 61 | ||
55 | QPixmap dpm = loadPixmap( pix + "_disabled" ); | 62 | QPixmap dpm = loadPixmap( pix + "_disabled" ); |
56 | QPixmap pm = loadPixmap( pix ); | 63 | QPixmap pm = loadPixmap( pix ); |
@@ -58,7 +65,10 @@ inline QIconSet Resource::loadIconSet( const QString &pix ) | |||
58 | if ( !dpm.isNull() ) | 65 | if ( !dpm.isNull() ) |
59 | is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); | 66 | is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); |
60 | 67 | ||
68 | #ifdef OPIE_INTERNAL_LIBRARY_BUILD | ||
61 | qpe_fast_findPixmap = oldMode; | 69 | qpe_fast_findPixmap = oldMode; |
70 | #endif | ||
71 | |||
62 | return is; | 72 | return is; |
63 | } | 73 | } |
64 | 74 | ||