Skip to content

Commit

Permalink
Signature of virtual method has changed in qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jul 20, 2021
1 parent 98257b8 commit 02afa1e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
Expand Up @@ -25,7 +25,11 @@ QgsModelDesignerInputsTreeWidget::QgsModelDesignerInputsTreeWidget( QWidget *par

}

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QMimeData *QgsModelDesignerInputsTreeWidget::mimeData( const QList<QTreeWidgetItem *> items ) const
#else
QMimeData *QgsModelDesignerInputsTreeWidget::mimeData( const QList<QTreeWidgetItem *> &items ) const
#endif
{
if ( items.empty() )
return nullptr;
Expand Down
4 changes: 4 additions & 0 deletions src/gui/processing/models/qgsmodeldesignerinputstreewidget.h
Expand Up @@ -41,7 +41,11 @@ class QgsModelDesignerInputsTreeWidget : public QTreeWidget
*/
explicit QgsModelDesignerInputsTreeWidget( QWidget *parent = nullptr );

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QMimeData *mimeData( const QList<QTreeWidgetItem *> items ) const override;
#else
QMimeData *mimeData( const QList<QTreeWidgetItem *> &items ) const override;
#endif
};

///@endcond
Expand Down
4 changes: 4 additions & 0 deletions src/gui/vector/qgsattributesformproperties.cpp
Expand Up @@ -1092,7 +1092,11 @@ QStringList QgsAttributesDnDTree::mimeTypes() const
return QStringList() << QStringLiteral( "application/x-qgsattributetabledesignerelement" );
}

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QMimeData *QgsAttributesDnDTree::mimeData( const QList<QTreeWidgetItem *> items ) const
#else
QMimeData *QgsAttributesDnDTree::mimeData( const QList<QTreeWidgetItem *> &items ) const
#endif
{
if ( items.count() <= 0 )
return nullptr;
Expand Down
6 changes: 5 additions & 1 deletion src/gui/vector/qgsattributesformproperties.h
Expand Up @@ -304,8 +304,12 @@ class GUI_EXPORT QgsAttributesDnDTree : public QTreeWidget
// QTreeWidget interface
protected:
QStringList mimeTypes() const override;
QMimeData *mimeData( const QList<QTreeWidgetItem *> items ) const override;

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QMimeData *mimeData( const QList<QTreeWidgetItem *> items ) const override;
#else
QMimeData *mimeData( const QList<QTreeWidgetItem *> &items ) const override;
#endif

private slots:
void onItemDoubleClicked( QTreeWidgetItem *item, int column );
Expand Down

0 comments on commit 02afa1e

Please sign in to comment.