diff --git a/autotests/aztecbarcodetest.cpp b/autotests/aztecbarcodetest.cpp --- a/autotests/aztecbarcodetest.cpp +++ b/autotests/aztecbarcodetest.cpp @@ -388,13 +388,20 @@ { std::unique_ptr barcode(Prison::createBarcode(Prison::Aztec)); QVERIFY(barcode); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QVERIFY(!barcode->minimumSize().isValid()); +#endif barcode->setData(QStringLiteral("UNIT TEST")); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QCOMPARE(barcode->minimumSize(), QSize(60, 60)); +#endif QCOMPARE(barcode->trueMinimumSize(), QSize(15, 15)); QCOMPARE(barcode->preferredSize(1), QSize(60, 60)); QCOMPARE(barcode->preferredSize(2), QSize(30, 30)); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QCOMPARE(barcode->toImage(barcode->minimumSize()).size(), QSize(60, 60)); +#endif + QCOMPARE(barcode->toImage(barcode->preferredSize(1)).size(), QSize(60, 60)); QCOMPARE(barcode->toImage({1, 1}).isNull(), true); } }; diff --git a/autotests/code128barcodetest.cpp b/autotests/code128barcodetest.cpp --- a/autotests/code128barcodetest.cpp +++ b/autotests/code128barcodetest.cpp @@ -105,13 +105,20 @@ { std::unique_ptr barcode(Prison::createBarcode(Prison::Code128)); QVERIFY(barcode); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QVERIFY(!barcode->minimumSize().isValid()); +#endif barcode->setData(QStringLiteral("UNIT TEST")); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QCOMPARE(barcode->minimumSize(), QSize(154, 10)); +#endif QCOMPARE(barcode->trueMinimumSize(), QSize(154, 1)); QCOMPARE(barcode->preferredSize(1), QSize(308, 50)); QCOMPARE(barcode->preferredSize(2), QSize(154, 50)); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QCOMPARE(barcode->toImage(barcode->minimumSize()).size(), QSize(154, 10)); +#endif + QCOMPARE(barcode->toImage(barcode->preferredSize(1)).size(), QSize(308, 50)); QCOMPARE(barcode->toImage({1, 1}).isNull(), true); } }; diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -33,7 +33,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.69 + DEPRECATION_VERSIONS 5.69 5.71 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) add_library(KF5::Prison ALIAS KF5Prison) diff --git a/src/lib/abstractbarcode.h b/src/lib/abstractbarcode.h --- a/src/lib/abstractbarcode.h +++ b/src/lib/abstractbarcode.h @@ -59,13 +59,16 @@ * a null QImage will be returned */ QImage toImage(const QSizeF& size) ; +#if PRISON_ENABLE_DEPRECATED_SINCE(5, 71) /** * The minimal size of this barcode. * @note This isn't the absolute minimum, but closer to the result of preferredSize(1). * @return the minimal size for this barcode. - * @deprecated since 5.69 Prefer preferredSize() or trueMinimumSize(). + * @deprecated since 5.69, use preferredSize() or trueMinimumSize(). */ + PRISON_DEPRECATED_VERSION_BELATED(5, 71, 5, 69, "Use preferredSize() or trueMinimumSize()") QSizeF minimumSize() const; +#endif /** * The minimal amount of pixels needed to represent this barcode without loss of information. diff --git a/src/lib/abstractbarcode.cpp b/src/lib/abstractbarcode.cpp --- a/src/lib/abstractbarcode.cpp +++ b/src/lib/abstractbarcode.cpp @@ -85,6 +85,7 @@ d->m_cache=QImage(); } +#if PRISON_BUILD_DEPRECATED_SINCE(5, 71) QSizeF AbstractBarcode::minimumSize() const { d->recompute(); @@ -105,6 +106,7 @@ return d->m_cache.size(); } +#endif QSizeF AbstractBarcode::trueMinimumSize() const { diff --git a/tests/barcodeexamplewidget.cpp b/tests/barcodeexamplewidget.cpp --- a/tests/barcodeexamplewidget.cpp +++ b/tests/barcodeexamplewidget.cpp @@ -6,6 +6,8 @@ #include "barcodeexamplewidget.h" #include "src/lib/abstractbarcode.h" +#include +#include #include #include #include @@ -72,7 +74,7 @@ QSize BarcodeExampleWidget::minimumSizeHint() const { if(m_barcode) { - return m_barcode->minimumSize().toSize(); + return m_barcode->preferredSize(QGuiApplication::primaryScreen()->devicePixelRatio()).toSize(); } else { return QWidget::minimumSizeHint(); }