diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:47 +0200 |
| commit | 2785bcb8f0ac04d0d2bc73b06206af1566c43958 (patch) | |
| tree | e617f035f4fd96a23220197cfc4e7fd9d0ed83d9 | |
| parent | 057db0fb6c7467eae9bcdd799325a60046e870ef (diff) | |
| parent | 0501cf413309ea70b374d03e8ba7d49f3b4b3e6f (diff) | |
| download | qtquickcontrols-2785bcb8f0ac04d0d2bc73b06206af1566c43958.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | src/controls/controls.pro | 2 | ||||
| -rw-r--r-- | tests/auto/extras/BLACKLIST | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 3119d33d..39a78904 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -78,7 +78,7 @@ INCLUDED_RESOURCE_FILES += $$SHADER_FILES controls.files = $$INCLUDED_RESOURCE_FILES controls.prefix = /QtQuick/Controls -RESOURCES += controls +!static:RESOURCES += controls CONFIG += no_cxx_module load(qml_plugin) diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST new file mode 100644 index 00000000..3d8aae5d --- /dev/null +++ b/tests/auto/extras/BLACKLIST @@ -0,0 +1,8 @@ +[Tests_Picture::test_color] +msvc-2019 +[Tests_StatusIndicator::test_active] +msvc-2019 +[Tests_StatusIndicator::test_baseStyleHasOuterShadow] +msvc-2019 +[Tests_StatusIndicator::test_color] +msvc-2019 |