Designer: Use QWidget::grab() instead of QPixmap::grabWidget().

Suppress deprecation warnings.

Change-Id: If254bab3683f21f8eb85f1f2a2c881d285c093ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
index a460236..64a6bc9 100644 (file)
--- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
@@ -59,7 +59,7 @@ using namespace qdesigner_internal;
 static QWidget *decorationFromWidget(QWidget *w)
 {
     QLabel *label = new QLabel(0, Qt::ToolTip);
-    QPixmap pm = QPixmap::grabWidget(w);
+    QPixmap pm = w->grab(QRect(0, 0, -1, -1));
     label->setPixmap(pm);
     label->resize(pm.size());
 

diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 5c5e90d..d28eace 100644 (file)
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -635,14 +635,14 @@ QPixmap  ActionRepositoryMimeData::actionDragPixmap(const QAction *action)
 
     foreach (QWidget *w, action->associatedWidgets())
         if (QToolButton *tb = qobject_cast<QToolButton *>(w))
-            return QPixmap::grabWidget(tb);
+            return tb->grab(QRect(0, 0, -1, -1));
 
     // Create a QToolButton
     QToolButton *tb = new QToolButton;
     tb->setText(action->text());
     tb->setToolButtonStyle(Qt::ToolButtonTextOnly);
     tb->adjustSize();
-    const QPixmap rc = QPixmap::grabWidget(tb);
+    const QPixmap rc = tb->grab(QRect(0, 0, -1, -1));
     tb->deleteLater();
     return rc;
 }

diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index e7f06f1..9fb2604 100644 (file)
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -319,7 +319,7 @@ QImage NewFormWidget::grabForm(QDesignerFormEditorInterface *core,
     if (!widget)
         return QImage();
 
-    const QPixmap pixmap = QPixmap::grabWidget(widget);
+    const QPixmap pixmap = widget->grab(QRect(0, 0, -1, -1));
     widget->deleteLater();
     return pixmap.toImage();
 }

diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 18a06a9..9b18b2c 100644 (file)
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -924,7 +924,7 @@ QPixmap PreviewManager::createPreviewPixmap(const QDesignerFormWindowInterface *
     QWidget *widget = createPreview(fw, pc, deviceProfileIndex, errorMessage);
     if (!widget)
         return QPixmap();
-    const QPixmap rc = QPixmap::grabWidget(widget);
+    const QPixmap rc = widget->grab(QRect(0, 0, -1, -1));
     widget->deleteLater();
     return rc;
 }

diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
index 62c4ce5..09862e6 100644 (file)
--- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -142,7 +142,7 @@ QDesignerMimeData::QDesignerMimeData(const QDesignerDnDItems &items, QDrag *drag
     case 1: {
         QWidget *deco = m_items.first()->decoration();
         decorationTopLeft = deco->pos();
-        const QPixmap widgetPixmap = QPixmap::grabWidget(deco);
+        const QPixmap widgetPixmap = deco->grab(QRect(0, 0, -1, -1));
 #ifdef TRANSPARENT_DRAG_PIXMAP
         QImage image(widgetPixmap.size(), QImage::Format_ARGB32);
         image.fill(QColor(Qt::transparent).rgba());
@@ -175,7 +175,7 @@ QDesignerMimeData::QDesignerMimeData(const QDesignerDnDItems &items, QDrag *drag
         decorationTopLeft = unitedGeometry.topLeft();
         for (it = m_items.constBegin() ; it != cend; ++it ) {
             QWidget *w = (*it)->decoration();
-            const QPixmap wp = QPixmap::grabWidget(w);
+            const QPixmap wp = w->grab(QRect(0, 0, -1, -1));
             const QPoint pos = w->pos() - decorationTopLeft;
             painter.drawPixmap(pos, wp);
             maskPainter.fillRect(QRect(pos, wp.size()), Qt::color1);

diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
index 26d9f4f..cc80999 100644 (file)
--- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -406,7 +406,7 @@ QPixmap QDesignerFormBuilder::createPreviewPixmap(const QDesignerFormWindowInter
     if (!widget)
         return QPixmap();
 
-    const QPixmap rc = QPixmap::grabWidget (widget);
+    const QPixmap rc = widget->grab(QRect(0, 0, -1, -1));
     widget->deleteLater();
     return rc;
 }

diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
index 9f4ebc1..e0638ff 100644 (file)
--- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -226,7 +226,7 @@ bool QTabWidgetEventFilter::eventFilter(QObject *o, QEvent *e)
             if (m_dragIcon.isNull()) {
                 QLabel *label = new QLabel(m_dragLabel);
                 label->adjustSize();
-                drg->setPixmap(QPixmap::grabWidget(label));
+                drg->setPixmap(label->grab(QRect(0, 0, -1, -1)));
                 label->deleteLater();
             } else {
                 drg->setPixmap(m_dragIcon.pixmap(22, 22));