Remove usages of deprecated APIs of qtbase/gui

- Replaced the usages of deprecated APIs by corresponding
  alternatives in the library code and documentation.

- Modified the tests to make them build when deprecated APIs disabled:
    * Made the the parts of the tests testing the deprecated APIs to
      be compiled conditionally, only when the corresponding methods are
      enabled.
    * If the test-case tests only the deprecated API, but not the
      corresponding replacement, added tests for the replacement.

Change-Id: Ic38245015377fc0c8127eb5458c184ffd4b450f1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

3 files changed, 44 insertions, 4 deletions

diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 901284e131..96f3b1c1d7 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -58,7 +58,9 @@ private slots:
     void insertAndRemoveSubstitutions();
     void serialize_data();
     void serialize();
+#if QT_DEPRECATED_SINCE(5, 13)
     void lastResortFont();
+#endif
     void styleName();
     void defaultFamily_data();
     void defaultFamily();
@@ -484,6 +486,7 @@ void tst_QFont::serialize()
     }
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 // QFont::lastResortFont() may abort with qFatal() on QWS/QPA
 // if absolutely no font is found. Just as ducumented for QFont::lastResortFont().
 // This happens on our CI machines which run QWS autotests.
@@ -494,6 +497,7 @@ void tst_QFont::lastResortFont()
     QFont font;
     QVERIFY(!font.lastResortFont().isEmpty());
 }
+#endif
 
 void tst_QFont::styleName()
 {
diff --git a/tests/auto/gui/text/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro
index 2faadfcb0d..73e94d5735 100644
--- a/tests/auto/gui/text/qtexttable/qtexttable.pro
+++ b/tests/auto/gui/text/qtexttable/qtexttable.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qtexttable
-QT += testlib
+QT += testlib gui-private
 qtHaveModule(widgets): QT += widgets
 SOURCES  += tst_qtexttable.cpp
 
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 22f00c677d..f21b969aa7 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -44,6 +44,7 @@
 #include <QPainter>
 #include <QPaintEngine>
 #endif
+#include <private/qpagedpaintdevice_p.h>
 
 typedef QList<int> IntList;
 
@@ -91,7 +92,7 @@ private slots:
     void QTBUG11282_insertBeforeMergedEnding();
 #endif
     void QTBUG22011_insertBeforeRowSpan();
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && defined(QT_BUILD_INTERNAL)
     void QTBUG31330_renderBackground();
 #endif
 
@@ -1025,7 +1026,7 @@ void tst_QTextTable::QTBUG22011_insertBeforeRowSpan()
     QCOMPARE(table->columns(), 6);
 }
 
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && defined(QT_BUILD_INTERNAL)
 namespace {
 class QTBUG31330_PaintDevice : public QPagedPaintDevice
 {
@@ -1065,11 +1066,46 @@ public:
         {}
     };
 
+    class QDummyPagedPaintDevicePrivate : public QPagedPaintDevicePrivate
+    {
+        bool setPageLayout(const QPageLayout &newPageLayout) override
+        {
+            m_pageLayout = newPageLayout;
+            return m_pageLayout.isEquivalentTo(newPageLayout);
+        }
+
+        bool setPageSize(const QPageSize &pageSize) override
+        {
+            m_pageLayout.setPageSize(pageSize);
+            return m_pageLayout.pageSize().isEquivalentTo(pageSize);
+        }
+
+        bool setPageOrientation(QPageLayout::Orientation orientation) override
+        {
+            m_pageLayout.setOrientation(orientation);
+            return m_pageLayout.orientation() == orientation;
+        }
+
+        bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) override
+        {
+            m_pageLayout.setUnits(units);
+            m_pageLayout.setMargins(margins);
+            return m_pageLayout.margins() == margins && m_pageLayout.units() == units;
+        }
+
+        QPageLayout pageLayout() const override
+        {
+            return m_pageLayout;
+        }
+
+        QPageLayout m_pageLayout;
+    };
+
     int pages;
     QPaintEngine* engine;
 
     QTBUG31330_PaintDevice(QPaintEngine* engine)
-        : pages(1), engine(engine)
+        : QPagedPaintDevice(new QDummyPagedPaintDevicePrivate), pages(1), engine(engine)
     {
         QPageLayout layout = pageLayout();
         layout.setUnits(QPageLayout::Point);