diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-08 12:50:28 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-10 22:40:22 +0000 |
| commit | 772c01c0ced1c3420b2c8fb3ec4b4bbc898b7d6a (patch) | |
| tree | e7e18732a0ab2400ac881d2417ca6d78d2e3e354 /tests/auto/customization/tst_customization.cpp | |
| parent | f809956420410b0152163dcf1e9923ff2de9cb68 (diff) | |
tst_customization: add data rows for new controls in 5.10
Change-Id: I7cf0a01648d95c386cbf916107546e4f46fadc73
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/customization/tst_customization.cpp')
| -rw-r--r-- | tests/auto/customization/tst_customization.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp index b20b89d1..3fabfaee 100644 --- a/tests/auto/customization/tst_customization.cpp +++ b/tests/auto/customization/tst_customization.cpp @@ -72,6 +72,8 @@ static const ControlInfo ControlInfos[] = { { "ItemDelegate", QStringList() << "background" << "contentItem" }, { "Label", QStringList() << "background" }, { "Menu", QStringList() << "background" << "contentItem" }, + { "MenuBar", QStringList() << "background" << "contentItem" }, + { "MenuBarItem", QStringList() << "background" << "contentItem" }, { "MenuItem", QStringList() << "background" << "contentItem" << "indicator" }, { "MenuSeparator", QStringList() << "background" << "contentItem" }, { "Page", QStringList() << "background" << "contentItem" }, @@ -251,7 +253,7 @@ void tst_customization::reset() QObject* tst_customization::createControl(const QString &name, const QString &qml, QString *error) { QQmlComponent component(engine); - component.setData("import QtQuick 2.9; import QtQuick.Window 2.2; import QtQuick.Controls 2.2; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); + component.setData("import QtQuick 2.10; import QtQuick.Window 2.2; import QtQuick.Controls 2.3; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); QObject *obj = component.create(); if (!obj) *error = component.errorString(); |