diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
| commit | e9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch) | |
| tree | cc9fc9c931423674081b6ab843d22bc643a5df64 /src/tools | |
| parent | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff) | |
| parent | a2a3adf7de2ffc9784fea177a43f3124862a992a (diff) | |
| download | Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2 | |
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'src/tools')
| -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[] = {", |