diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:12 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:12 +0100 |
| commit | 87859b2aecbecdab8fd001e3a52887980b0735e8 (patch) | |
| tree | 05b5ff0507643cfb734914d5c079afd13bbcff27 | |
| parent | 5b036c7b75b187838ff8e96141b163bba6477509 (diff) | |
| parent | 48e60b9b0a6fd2e9c1a548b1ca79bd5b81e93dd2 (diff) | |
| download | qtquickcontrols-87859b2aecbecdab8fd001e3a52887980b0735e8.tar.gz | |
Merge 5.10 into 5.10.0
Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
| -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() } |