From a6d21e484a4d0f3308dbdb157e602ab5965bccf3 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 14 Nov 2017 13:26:39 +0100 Subject: Fix base slider style in static builds Avoid errors like ShaderEffect: Failed to read :/QtQuick/Controls/Shaders/blur.vert in static builds. Task-number: QTBUG-64488 Change-Id: I13b8aa0736db68859e0b4539937952f9c4b5b04b Reviewed-by: J-P Nurmi --- src/controls/plugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index bac0d64d..2590d892 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 } -- cgit v1.2.1 From aa081a76fe19fd606469c53a829c6f00b190cafd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 15 Nov 2017 15:21:43 +0100 Subject: test: skip Tests_TableView::test_resize_columns() on b2qt Task-number: QTBUG-64523 Change-Id: Icc369c1933a725321927f46255bb396800a0ac5d Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_tableview.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 0b54634e..8bd40ae3 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -972,7 +972,7 @@ TestCase { compare(table.getColumn(0).width, 20) table.resizeColumnsToContents() if (Qt.platform.pluginName === "offscreen") - expectFail("", "QTBUG-62496") + skip("", "QTBUG-62496") compare(table.getColumn(0).width, 50) table.destroy() } -- cgit v1.2.1 From 48e60b9b0a6fd2e9c1a548b1ca79bd5b81e93dd2 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 16 Nov 2017 12:36:20 +0200 Subject: test: enable Tests_TableView::test_resize_columns() on b2qt Test was fixed by commit c84f7554894cef0cbeeba8a61f441286e190a797 in qtbase. Task-number: QTBUG-64523 Change-Id: I86195fe049c61ceab43566d004c8f6e6bfcee041 Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_tableview.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 8bd40ae3..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") - skip("", "QTBUG-62496") compare(table.getColumn(0).width, 50) table.destroy() } -- cgit v1.2.1