diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 13:36:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 13:36:26 +0100 |
| commit | deb779cdbaeeaea52ca0e99c9295db587c25f41c (patch) | |
| tree | 82765e08678818ed21a6f9d5354ac852b0613460 /tests/auto/customization | |
| parent | 26056b52b182b4452855f54a2c811d64246c434a (diff) | |
| parent | d64774add9fafa24406a202d0313e10780e1e715 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquicktumbler.cpp
src/quicktemplates2/qquicktumbler_p.h
src/quicktemplates2/qquicktumbler_p_p.h
Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
Diffstat (limited to 'tests/auto/customization')
| -rw-r--r-- | tests/auto/customization/tst_customization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp index cd939bcc..91b5706c 100644 --- a/tests/auto/customization/tst_customization.cpp +++ b/tests/auto/customization/tst_customization.cpp @@ -103,7 +103,7 @@ static const ControlInfo ControlInfos[] = { { "ToolButton", QStringList() << "background" << "contentItem" }, { "ToolSeparator", QStringList() << "background" << "contentItem" }, { "ToolTip", QStringList() << "background" << "contentItem" }, - // { "Tumbler", QStringList() << "background" << "contentItem" } ### TODO: fix and enable deferred execution + { "Tumbler", QStringList() << "background" << "contentItem" } }; class tst_customization : public QQmlDataTest |