diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 12:32:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 16:26:36 +0200 |
| commit | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (patch) | |
| tree | 580aa25716bfc88d57f15ad68f7bfa727aebc400 /tests/manual/qcursor | |
| parent | f955bd8ced8b93d142b7f755665946424c6d3644 (diff) | |
| parent | 3622ebaac51abd2e4d1541120ae3b6e42932359f (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'tests/manual/qcursor')
| -rw-r--r-- | tests/manual/qcursor/qcursorhighdpi/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/qcursor/qcursorhighdpi/main.cpp b/tests/manual/qcursor/qcursorhighdpi/main.cpp index 4a7646c39d..3b18bff91c 100644 --- a/tests/manual/qcursor/qcursorhighdpi/main.cpp +++ b/tests/manual/qcursor/qcursorhighdpi/main.cpp @@ -183,7 +183,7 @@ private: void DraggableLabel::mousePressEvent(QMouseEvent *) { QMimeData *mimeData = new QMimeData; - mimeData->setImageData(qVariantFromValue(m_pixmap)); + mimeData->setImageData(QVariant::fromValue(m_pixmap)); QDrag *drag = new QDrag(this); QPixmap pixmap = m_pixmap; if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { |