diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-11 11:35:44 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-11 12:28:44 +0000 |
commit | 7044c0c82c1bccbff9f7ab0d8344c89fcf7cc043 (patch) | |
tree | 2ae8b82ae09941990e726a821263da0edf049d65 /tests | |
parent | 7d7038d47a72cd203785080e997458f0d44f5e15 (diff) |
Fix deprecation warnings
utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
volumetrictest.cpp:384:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations]
volumetrictest.cpp:538:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations]
Change-Id: I59d0ce39584b11ec239cbdadf067c30cf37ca05a
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/manual/volumetrictest/volumetrictest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp index 09dae433..6b2a57a8 100644 --- a/tests/manual/volumetrictest/volumetrictest.cpp +++ b/tests/manual/volumetrictest/volumetrictest.cpp @@ -381,7 +381,7 @@ void VolumetricModifier::createVolume() logo.load(QStringLiteral(":/logo_no_padding.png")); //logo.load(QStringLiteral(":/logo.png")); qDebug() << "image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); QVector<QImage *> imageArray(imageCount); @@ -535,7 +535,7 @@ void VolumetricModifier::createAnotherVolume() //logo.load(QStringLiteral(":/logo.png")); logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied); qDebug() << "second image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); logo.save("d:/qt/goobar.png"); |