Use QWidget::grab() instead of deprecated QPixmap::grabWidget() on Qt5

PhysSong · Oct 24, 2017 · 4dc06f6 · 4dc06f6
1 parent 370982b
commit 4dc06f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h
@@ -57,5 +57,10 @@ class EXPORT StringPairDrag : public QDrag
 
 } ;
 
+#if QT_VERSION >= 0x050000
+#define GRAB(x) x->grab()
+#else
+#define GRAB(x) QPixmap::grabWidget(x)
+#endif
 
 #endif
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
@@ -702,7 +702,7 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
 				QVector<TrackContentObjectView *> tcoViews;
 				tcoViews.push_back( this );
 				DataFile dataFile = createTCODataFiles( tcoViews );
-				QPixmap thumbnail = QPixmap::grabWidget( this ).scaled(
+				QPixmap thumbnail = GRAB( this ).scaled(
 							128, 128,
 							Qt::KeepAspectRatio,
 							Qt::SmoothTransformation );
@@ -839,7 +839,7 @@ void TrackContentObjectView::mouseMoveEvent( QMouseEvent * me )
 			DataFile dataFile = createTCODataFiles( tcoViews );
 
 			// TODO -- thumbnail for all selected
-			QPixmap thumbnail = QPixmap::grabWidget( this ).scaled(
+			QPixmap thumbnail = GRAB( this ).scaled(
 				128, 128,
 				Qt::KeepAspectRatio,
 				Qt::SmoothTransformation );
@@ -1763,7 +1763,7 @@ void TrackOperationsWidget::mousePressEvent( QMouseEvent * me )
 		m_trackView->getTrack()->saveState( dataFile, dataFile.content() );
 		new StringPairDrag( QString( "track_%1" ).arg(
 					m_trackView->getTrack()->type() ),
-			dataFile.toString(), QPixmap::grabWidget(
+			dataFile.toString(), GRAB(
 				m_trackView->getTrackSettingsWidget() ),
 									this );
 	}

diff --git a/src/gui/StringPairDrag.cpp b/src/gui/StringPairDrag.cpp
@@ -40,7 +40,7 @@ StringPairDrag::StringPairDrag( const QString & _key, const QString & _value,
 {
 	if( _icon.isNull() && _w )
 	{
-		setPixmap( QPixmap::grabWidget( _w ).scaled(
+		setPixmap( GRAB( _w ).scaled(
 						64, 64,
 						Qt::KeepAspectRatio,
 						Qt::SmoothTransformation ) );