diff options
| -rw-r--r-- | src/controls/plugin.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_tableview.qml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 5a5a9605..f78098ec 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -75,6 +75,7 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Controls); + Q_INIT_RESOURCE(qmake_controls); #endif } diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 0b54634e..fe50f241 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -971,8 +971,6 @@ TestCase { table.getColumn(0).width = 20 compare(table.getColumn(0).width, 20) table.resizeColumnsToContents() - if (Qt.platform.pluginName === "offscreen") - expectFail("", "QTBUG-62496") compare(table.getColumn(0).width, 50) table.destroy() } |