diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2019-04-03 10:54:55 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-04-03 09:01:36 +0000 |
commit | 6c787542df32c59fe0299b2ad884968de28dbcba (patch) | |
tree | 18886821fe6fe4eb04e2f44a8f21e58c05a4cac6 /src/quicktemplates2 | |
parent | d8981425c33f3bae930f31fbb2cf804c7337f33a (diff) |
Fix broken build
- Remove the override keyword from
QQuickComboBoxDelegateModel::stringValue() as the function is no
longer virtual, and a change in dev will fix this properly once a
qt5.git submodule update happens.
- Temporarily skip any failing ComboBox tests that result from the
previous step.
Task-number: QTBUG-74919
Change-Id: If57bfbd1c8b253cb9ad3bfad4b5f9b9a271744ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 03dd6086..09b5e376 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -184,7 +184,7 @@ class QQuickComboBoxDelegateModel : public QQmlDelegateModel { public: explicit QQuickComboBoxDelegateModel(QQuickComboBox *combo); - QString stringValue(int index, const QString &role) override; + QString stringValue(int index, const QString &role); private: QQuickComboBox *combo = nullptr; |