| author | zecke <zecke> | 2004-02-18 19:10:20 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-02-18 19:10:20 (UTC) |
| commit | 859ad22772e90dfbd4a8c0760ddc52d451f50011 (patch) (side-by-side diff) | |
| tree | f5c37a68dd06326703205f665aa193ce16481b6c /library | |
| parent | 7d16774139aa40fb812d636bcf9ad3f45aa2b9e1 (diff) | |
| download | opie-859ad22772e90dfbd4a8c0760ddc52d451f50011.zip opie-859ad22772e90dfbd4a8c0760ddc52d451f50011.tar.gz opie-859ad22772e90dfbd4a8c0760ddc52d451f50011.tar.bz2 | |
Commit the patch to allow overwriting the inline image
| -rw-r--r-- | library/resource.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/library/resource.cpp b/library/resource.cpp index 4108883..f70658d 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -38,2 +38,4 @@ namespace { +static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); + /*! @@ -161,3 +163,15 @@ static QImage load_image(const QString &name) { + if (g_notUseSet ) { + // try file + QImage img; + QString f = Resource::findPixmap(name); + if ( !f.isEmpty() ) + img.load(f); + if (img.isNull() ) + img = qembed_findImage(name.latin1() ); + return img; + } + else{ QImage img = qembed_findImage(name.latin1()); + if ( img.isNull() ) { @@ -170,2 +184,3 @@ static QImage load_image(const QString &name) } +} |