diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
| commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
| tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /src/widgets | |
| parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
| parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 3c46f4faca..689704884f 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1820,13 +1820,10 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "<p>Qt licensed under our commercial license agreement is appropriate " "for development of proprietary/commercial software where you do not " "want to share any source code with third parties or otherwise cannot " - "comply with the terms of the GNU LGPL version 3 or GNU LGPL version 2.1.</p>" + "comply with the terms of the GNU LGPL version 3.</p>" "<p>Qt licensed under the GNU LGPL version 3 is appropriate for the " "development of Qt applications provided you can comply with the terms " "and conditions of the GNU LGPL version 3.</p>" - "<p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the " - "development of Qt applications provided you can comply with the terms " - "and conditions of the GNU LGPL version 2.1.</p>" "<p>Please see <a href=\"http://%2/\">%2</a> " "for an overview of Qt licensing.</p>" "<p>Copyright (C) %1 The Qt Company Ltd and other " diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index cd3081dae5..1e7ca803d6 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -3231,7 +3231,8 @@ void QTreeViewPrivate::drawAnimatedOperation(QPainter *painter) const QPixmap QTreeViewPrivate::renderTreeToPixmapForAnimation(const QRect &rect) const { Q_Q(const QTreeView); - QPixmap pixmap(rect.size()); + QPixmap pixmap(rect.size() * q->devicePixelRatio()); + pixmap.setDevicePixelRatio(q->devicePixelRatio()); if (rect.size().isEmpty()) return pixmap; pixmap.fill(Qt::transparent); //the base might not be opaque, and we don't want uninitialized pixels. |