From 6c787542df32c59fe0299b2ad884968de28dbcba Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Wed, 3 Apr 2019 10:54:55 +0200
Subject: 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>
---
 src/quicktemplates2/qquickcombobox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quicktemplates2/qquickcombobox.cpp')

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;
-- 
cgit v1.2.3