diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
| commit | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (patch) | |
| tree | 7e41a16587d903498fbb1ca71cd286a9ba156241 /src/tools/uic3/embed.cpp | |
| parent | f656909791819b3f033f9ec1bd0de524b92919e2 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.zip Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.gz Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6-platform
Diffstat (limited to 'src/tools/uic3/embed.cpp')
| -rw-r--r-- | src/tools/uic3/embed.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/uic3/embed.cpp b/src/tools/uic3/embed.cpp index d699623..2eb4dd5 100644 --- a/src/tools/uic3/embed.cpp +++ b/src/tools/uic3/embed.cpp @@ -177,7 +177,7 @@ void Ui3Reader::embed(const char *project, const QStringList &images) e->width = img.width(); e->height = img.height(); e->depth = img.depth(); - e->numColors = img.numColors(); + e->numColors = img.colorCount(); e->colorTable = new QRgb[e->numColors]; e->alpha = img.hasAlphaBuffer(); QVector<QRgb> ct = img.colorTable(); @@ -195,7 +195,7 @@ void Ui3Reader::embed(const char *project, const QStringList &images) #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION e->compressed = #endif - embedData( out, img.bits(), img.numBytes() ); + embedData( out, img.bits(), img.byteCount() ); out << "\n};\n\n"; if ( e->numColors ) { out << s.sprintf( "static const QRgb %s_ctable[] = {", |