Fix qtbase build when all deprecated code are disabled

Adjust the callers to use the non-deprecated APIs.

Pick-to: 6.5
Change-Id: I8e96f25684a2d613bc400a8626dc9e3af2bb8dcf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

5 files changed, 8 insertions, 8 deletions

diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp
index 271ef8c776..5a4ba901b7 100644
--- a/examples/widgets/desktop/screenshot/screenshot.cpp
+++ b/examples/widgets/desktop/screenshot/screenshot.cpp
@@ -62,7 +62,7 @@ void Screenshot::resizeEvent(QResizeEvent * /* event */)
 {
     QSize scaledSize = originalPixmap.size();
     scaledSize.scale(screenshotLabel->size(), Qt::KeepAspectRatio);
-    if (scaledSize != screenshotLabel->pixmap(Qt::ReturnByValue).size())
+    if (scaledSize != screenshotLabel->pixmap().size())
         updateScreenshotLabel();
 }
 //! [1]
diff --git a/examples/widgets/doc/src/imageviewer.qdoc b/examples/widgets/doc/src/imageviewer.qdoc
index 17b969d4c8..aa6eec46d8 100644
--- a/examples/widgets/doc/src/imageviewer.qdoc
+++ b/examples/widgets/doc/src/imageviewer.qdoc
@@ -151,8 +151,8 @@
     will expand to
 
     \code
-    if (imageLabel->pixmap(Qt::ReturnByValue).isNull())
-        qFatal("ASSERT: "imageLabel->pixmap(Qt::ReturnByValue).isNull()" in file ...");
+    if (imageLabel->pixmap().isNull())
+        qFatal("ASSERT: "imageLabel->pixmap().isNull()" in file ...");
     \endcode
 
     In release mode, the macro simply disappear. The mode can be set
diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
index 135574d058..ba06c836d4 100644
--- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
+++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
@@ -95,7 +95,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event)
     if (!child)
         return;
 
-    QPixmap pixmap = child->pixmap(Qt::ReturnByValue);
+    QPixmap pixmap = child->pixmap();
 
     QByteArray itemData;
     QDataStream dataStream(&itemData, QIODevice::WriteOnly);
diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
index 619e0c1200..a883e7c58a 100644
--- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
@@ -161,7 +161,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event)
 //! [16]
     QDrag *drag = new QDrag(this);
     drag->setMimeData(mimeData);
-    drag->setPixmap(child->pixmap(Qt::ReturnByValue));
+    drag->setPixmap(child->pixmap());
     drag->setHotSpot(hotSpot);
 
     child->hide();
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp
index d2bffc01d5..fd8fbaf2b8 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.cpp
+++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp
@@ -158,14 +158,14 @@ void ImageViewer::saveAs()
 void ImageViewer::print()
 //! [5] //! [6]
 {
-    Q_ASSERT(!imageLabel->pixmap(Qt::ReturnByValue).isNull());
+    Q_ASSERT(!imageLabel->pixmap().isNull());
 #if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
 //! [6] //! [7]
     QPrintDialog dialog(&printer, this);
 //! [7] //! [8]
     if (dialog.exec()) {
         QPainter painter(&printer);
-        QPixmap pixmap = imageLabel->pixmap(Qt::ReturnByValue);
+        QPixmap pixmap = imageLabel->pixmap();
         QRect rect = painter.viewport();
         QSize size = pixmap.size();
         size.scale(rect.size(), Qt::KeepAspectRatio);
@@ -343,7 +343,7 @@ void ImageViewer::scaleImage(double factor)
 //! [23] //! [24]
 {
     scaleFactor *= factor;
-    imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size());
+    imageLabel->resize(scaleFactor * imageLabel->pixmap().size());
 
     adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
     adjustScrollBar(scrollArea->verticalScrollBar(), factor);