diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:29:30 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:29:30 +0200 |
| commit | 4b0ab43f479e26271ffa675066afcfc97a0d3005 (patch) | |
| tree | 13ef6ebe473bc1fe2aa4ee5094534f6f9c3bd3cc | |
| parent | 3d74af5ee50fb949520f64923658a9b30b6bb5c8 (diff) | |
| parent | c76eb211ff12fc3a1588c3092dd76a41eb5551c7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I24471e6fd433c738dcce3de46071da22cfe6ae5a
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 1 | ||||
| -rw-r--r-- | src/effects/private/DropShadowBase.qml | 5 | ||||
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 898cedc..e139c9b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ load(qt_build_config) +DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + MODULE_VERSION = 6.0.0 + diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index 837929e..27d8917 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtgraphicaleffects.qdocconf) project = QtGraphicalEffects description = Qt Graphical Effects Reference Documentation diff --git a/src/effects/private/DropShadowBase.qml b/src/effects/private/DropShadowBase.qml index 7e80e47..e9927ea 100644 --- a/src/effects/private/DropShadowBase.qml +++ b/src/effects/private/DropShadowBase.qml @@ -38,6 +38,7 @@ ****************************************************************************/ import QtQuick 2.12 +import QtQuick.Window 2.12 import QtGraphicalEffects.private 1.12 import QtGraphicalEffects 1.12 @@ -61,8 +62,8 @@ Item { x: Math.round(horizontalOffset) y: Math.round(verticalOffset) source: root.source - radius: root.radius - samples: root.samples + radius: root.radius * Screen.devicePixelRatio + samples: root.samples * Screen.devicePixelRatio _thickness: root.spread transparentBorder: root.transparentBorder diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index 7f26b01..1d7a633 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -78,9 +78,9 @@ QString tst_qtgraphicaleffects::componentErrors(const QQmlComponent* component) QStringList out; - foreach (QQmlError const& error, component->errors()) { + const auto errors = component->errors(); + for (const QQmlError &error : errors) out << error.toString(); - } return out.join("\n"); } |