diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-04-14 14:38:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-22 10:21:44 +0200 |
| commit | 0293ea29918ecf1ddd69709e5dad629af59d7aa8 (patch) | |
| tree | 97deb6994fb94d0ba931bccc493ef152c3991687 /tests/auto/quickwidgets | |
| parent | d4edf441257b7e5782a6c25802d821647ffcba45 (diff) | |
Update dependencies.yaml and adapt to API changes in qtbase
The evaluation callback does not have to perform the comparison anymore
and the shared pointer of the private is not used in the API anymore.
Also, the versionFunctions() has been moved out of QOpenGLContext
and renamed QOpenGLVersionFunctionsFactory::get().
QHash doesn't keep iterators stable under erase(), so clean up
the code relying on it, and avoid an intermediate QList at the
same time.
Task-number: QTBUG-74409
Change-Id: I90176be1067d88c8f2b1ea07198a06d432f5be9c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests/auto/quickwidgets')
| -rw-r--r-- | tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp index 12c51caa75..8211400262 100644 --- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp +++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp @@ -701,7 +701,7 @@ void tst_qquickwidget::resizeOverlay() { QWidget widget; auto contentVerticalLayout = new QVBoxLayout(&widget); - contentVerticalLayout->setMargin(0); + contentVerticalLayout->setContentsMargins(0, 0, 0, 0); qmlRegisterType<Overlay>("Test", 1, 0, "Overlay"); |