diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-30 00:49:54 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-30 00:49:54 +0100 |
commit | 2f502d9e123aabc930991cb5d3b04a2542df8612 (patch) | |
tree | 9bbf3372a7ba30222652f423f6a46f367a6dc686 /tests/manual | |
parent | ddbe8ceb77fe91a0a09428a705184e1b352bc596 (diff) | |
parent | b448bcb6df108d85e161d57307b398236df3a807 (diff) | |
download | qtgraphicaleffects-2f502d9e123aabc930991cb5d3b04a2542df8612.tar.gz |
Merge 5.12 into 5.12.0
Change-Id: I8a0e5853af30d185e426000561057210f432ac3d
Diffstat (limited to 'tests/manual')
47 files changed, 78 insertions, 78 deletions
diff --git a/tests/manual/SourceProxyTest.qml b/tests/manual/SourceProxyTest.qml index b3e3066..311f543 100644 --- a/tests/manual/SourceProxyTest.qml +++ b/tests/manual/SourceProxyTest.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtGraphicalEffects.private 1.0 -import QtQuick 2.4 +import QtGraphicalEffects.private 1.12 +import QtQuick 2.12 Rectangle { diff --git a/tests/manual/smooth/CellContainer.qml b/tests/manual/smooth/CellContainer.qml index 5a04bd3..60af0f7 100644 --- a/tests/manual/smooth/CellContainer.qml +++ b/tests/manual/smooth/CellContainer.qml @@ -1,5 +1,5 @@ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 Item { implicitWidth: children[0].implicitWidth * children[0].scale diff --git a/tests/manual/smooth/SourceImage.qml b/tests/manual/smooth/SourceImage.qml index 7956190..86cf269 100644 --- a/tests/manual/smooth/SourceImage.qml +++ b/tests/manual/smooth/SourceImage.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 Image { source: "star.png" diff --git a/tests/manual/smooth/main.qml b/tests/manual/smooth/main.qml index 36bfb12..3c458cc 100644 --- a/tests/manual/smooth/main.qml +++ b/tests/manual/smooth/main.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Window 2.3 -import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtQuick.Window 2.12 +import QtQuick.Layouts 1.12 +import QtGraphicalEffects 1.12 /* A testbench for source items (and effects) that set smooth to false. diff --git a/tests/manual/testSourceProxy.qml b/tests/manual/testSourceProxy.qml index c7f9e54..dcdae6f 100644 --- a/tests/manual/testSourceProxy.qml +++ b/tests/manual/testSourceProxy.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtGraphicalEffects.private 1.0 -import QtQuick 2.4; +import QtGraphicalEffects.private 1.12 +import QtQuick 2.12 Item { id: root diff --git a/tests/manual/testbed/BGColorPicker.qml b/tests/manual/testbed/BGColorPicker.qml index 2309182..0b06a8d 100644 --- a/tests/manual/testbed/BGColorPicker.qml +++ b/tests/manual/testbed/BGColorPicker.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Label { id: bgColorPicker diff --git a/tests/manual/testbed/CheckBox.qml b/tests/manual/testbed/CheckBox.qml index 5311507..2bd3fb6 100644 --- a/tests/manual/testbed/CheckBox.qml +++ b/tests/manual/testbed/CheckBox.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: checkBox diff --git a/tests/manual/testbed/ColorPicker.qml b/tests/manual/testbed/ColorPicker.qml index e1b4ebb..7181192 100644 --- a/tests/manual/testbed/ColorPicker.qml +++ b/tests/manual/testbed/ColorPicker.qml @@ -26,7 +26,7 @@ ** *****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: root diff --git a/tests/manual/testbed/ColorSlider.qml b/tests/manual/testbed/ColorSlider.qml index 61130fc..bdddac9 100644 --- a/tests/manual/testbed/ColorSlider.qml +++ b/tests/manual/testbed/ColorSlider.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: colorSlider diff --git a/tests/manual/testbed/Control.qml b/tests/manual/testbed/Control.qml index 91a19e6..dcc7257 100644 --- a/tests/manual/testbed/Control.qml +++ b/tests/manual/testbed/Control.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: control diff --git a/tests/manual/testbed/ImageSource.qml b/tests/manual/testbed/ImageSource.qml index 2322100..520eacd 100644 --- a/tests/manual/testbed/ImageSource.qml +++ b/tests/manual/testbed/ImageSource.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Image { id: is diff --git a/tests/manual/testbed/Label.qml b/tests/manual/testbed/Label.qml index 75c66ae..6a5964c 100644 --- a/tests/manual/testbed/Label.qml +++ b/tests/manual/testbed/Label.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: label diff --git a/tests/manual/testbed/LevelSlider.qml b/tests/manual/testbed/LevelSlider.qml index 8e78c10..f13928c 100644 --- a/tests/manual/testbed/LevelSlider.qml +++ b/tests/manual/testbed/LevelSlider.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: slider diff --git a/tests/manual/testbed/PositionPicker.qml b/tests/manual/testbed/PositionPicker.qml index 5994d14..2b85b36 100644 --- a/tests/manual/testbed/PositionPicker.qml +++ b/tests/manual/testbed/PositionPicker.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Image { id: positionPicker diff --git a/tests/manual/testbed/ProgressBar.qml b/tests/manual/testbed/ProgressBar.qml index 00f5286..067edfb 100644 --- a/tests/manual/testbed/ProgressBar.qml +++ b/tests/manual/testbed/ProgressBar.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: slider diff --git a/tests/manual/testbed/RadioButton.qml b/tests/manual/testbed/RadioButton.qml index bd148c8..1ab809d 100644 --- a/tests/manual/testbed/RadioButton.qml +++ b/tests/manual/testbed/RadioButton.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: radioButton diff --git a/tests/manual/testbed/RadioButtonColumn.qml b/tests/manual/testbed/RadioButtonColumn.qml index 97d94d7..3a16386 100644 --- a/tests/manual/testbed/RadioButtonColumn.qml +++ b/tests/manual/testbed/RadioButtonColumn.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: radioButtoncolumn diff --git a/tests/manual/testbed/RgbaColorPicker.qml b/tests/manual/testbed/RgbaColorPicker.qml index 749c201..0b48e95 100644 --- a/tests/manual/testbed/RgbaColorPicker.qml +++ b/tests/manual/testbed/RgbaColorPicker.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: rgbaSlider diff --git a/tests/manual/testbed/Slider.qml b/tests/manual/testbed/Slider.qml index 1de643f..a199a7f 100644 --- a/tests/manual/testbed/Slider.qml +++ b/tests/manual/testbed/Slider.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: slider diff --git a/tests/manual/testbed/TestBedModel.qml b/tests/manual/testbed/TestBedModel.qml index 641eeef..c299c39 100644 --- a/tests/manual/testbed/TestBedModel.qml +++ b/tests/manual/testbed/TestBedModel.qml @@ -26,7 +26,7 @@ ** *****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 ListModel { id: testcaseModel diff --git a/tests/manual/testbed/TestBlend.qml b/tests/manual/testbed/TestBlend.qml index 86e2bf4..c3852e1 100644 --- a/tests/manual/testbed/TestBlend.qml +++ b/tests/manual/testbed/TestBlend.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestBrightnessContrast.qml b/tests/manual/testbed/TestBrightnessContrast.qml index 387fc7c..20ce6cd 100644 --- a/tests/manual/testbed/TestBrightnessContrast.qml +++ b/tests/manual/testbed/TestBrightnessContrast.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestCaseTemplate.qml b/tests/manual/testbed/TestCaseTemplate.qml index 93e50de..6d15829 100644 --- a/tests/manual/testbed/TestCaseTemplate.qml +++ b/tests/manual/testbed/TestCaseTemplate.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Item { id: main diff --git a/tests/manual/testbed/TestColorOverlay.qml b/tests/manual/testbed/TestColorOverlay.qml index 6200b1e..112aa35 100644 --- a/tests/manual/testbed/TestColorOverlay.qml +++ b/tests/manual/testbed/TestColorOverlay.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestColorize.qml b/tests/manual/testbed/TestColorize.qml index 79d99c6..fed0d15 100644 --- a/tests/manual/testbed/TestColorize.qml +++ b/tests/manual/testbed/TestColorize.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestConicalGradient.qml b/tests/manual/testbed/TestConicalGradient.qml index 7c53bd1..8c7b145 100644 --- a/tests/manual/testbed/TestConicalGradient.qml +++ b/tests/manual/testbed/TestConicalGradient.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestDesaturate.qml b/tests/manual/testbed/TestDesaturate.qml index ea900b9..465a833 100644 --- a/tests/manual/testbed/TestDesaturate.qml +++ b/tests/manual/testbed/TestDesaturate.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestDirectionalBlur.qml b/tests/manual/testbed/TestDirectionalBlur.qml index 3b3ba89..a3455e8 100644 --- a/tests/manual/testbed/TestDirectionalBlur.qml +++ b/tests/manual/testbed/TestDirectionalBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestDisplace.qml b/tests/manual/testbed/TestDisplace.qml index 76bff5b..1aca077 100644 --- a/tests/manual/testbed/TestDisplace.qml +++ b/tests/manual/testbed/TestDisplace.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestDropShadow.qml b/tests/manual/testbed/TestDropShadow.qml index a74ad4b..93070be 100644 --- a/tests/manual/testbed/TestDropShadow.qml +++ b/tests/manual/testbed/TestDropShadow.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestFastBlur.qml b/tests/manual/testbed/TestFastBlur.qml index 459d196..70fb577 100644 --- a/tests/manual/testbed/TestFastBlur.qml +++ b/tests/manual/testbed/TestFastBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestGammaAdjust.qml b/tests/manual/testbed/TestGammaAdjust.qml index 400b3fb..9ea307e 100644 --- a/tests/manual/testbed/TestGammaAdjust.qml +++ b/tests/manual/testbed/TestGammaAdjust.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestGaussianBlur.qml b/tests/manual/testbed/TestGaussianBlur.qml index 196933d..13ce7fc 100644 --- a/tests/manual/testbed/TestGaussianBlur.qml +++ b/tests/manual/testbed/TestGaussianBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestGlow.qml b/tests/manual/testbed/TestGlow.qml index b82c4ef..997a838 100644 --- a/tests/manual/testbed/TestGlow.qml +++ b/tests/manual/testbed/TestGlow.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestHueSaturation.qml b/tests/manual/testbed/TestHueSaturation.qml index 3b1b954..4124767 100644 --- a/tests/manual/testbed/TestHueSaturation.qml +++ b/tests/manual/testbed/TestHueSaturation.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestInnerShadow.qml b/tests/manual/testbed/TestInnerShadow.qml index 38426ad..d17be5f 100644 --- a/tests/manual/testbed/TestInnerShadow.qml +++ b/tests/manual/testbed/TestInnerShadow.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestLevelAdjust.qml b/tests/manual/testbed/TestLevelAdjust.qml index 713a044..7e1b976 100644 --- a/tests/manual/testbed/TestLevelAdjust.qml +++ b/tests/manual/testbed/TestLevelAdjust.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestLinearGradient.qml b/tests/manual/testbed/TestLinearGradient.qml index 63cfd3d..500dd5a 100644 --- a/tests/manual/testbed/TestLinearGradient.qml +++ b/tests/manual/testbed/TestLinearGradient.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestMaskedBlur.qml b/tests/manual/testbed/TestMaskedBlur.qml index 1d37b24..c8b6b2d 100644 --- a/tests/manual/testbed/TestMaskedBlur.qml +++ b/tests/manual/testbed/TestMaskedBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestOpacityMask.qml b/tests/manual/testbed/TestOpacityMask.qml index a844911..12b1b0c 100644 --- a/tests/manual/testbed/TestOpacityMask.qml +++ b/tests/manual/testbed/TestOpacityMask.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestRadialBlur.qml b/tests/manual/testbed/TestRadialBlur.qml index 7f80d56..c2e0d95 100644 --- a/tests/manual/testbed/TestRadialBlur.qml +++ b/tests/manual/testbed/TestRadialBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestRadialGradient.qml b/tests/manual/testbed/TestRadialGradient.qml index 6ab565d..af17b5f 100644 --- a/tests/manual/testbed/TestRadialGradient.qml +++ b/tests/manual/testbed/TestRadialGradient.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestRectangularGlow.qml b/tests/manual/testbed/TestRectangularGlow.qml index 79841bc..fd5a3a0 100644 --- a/tests/manual/testbed/TestRectangularGlow.qml +++ b/tests/manual/testbed/TestRectangularGlow.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestRecursiveBlur.qml b/tests/manual/testbed/TestRecursiveBlur.qml index 1b9c77d..5e33ea3 100644 --- a/tests/manual/testbed/TestRecursiveBlur.qml +++ b/tests/manual/testbed/TestRecursiveBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { diff --git a/tests/manual/testbed/TestThresholdMask.qml b/tests/manual/testbed/TestThresholdMask.qml index b4fbc73..97bead2 100644 --- a/tests/manual/testbed/TestThresholdMask.qml +++ b/tests/manual/testbed/TestThresholdMask.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/TestZoomBlur.qml b/tests/manual/testbed/TestZoomBlur.qml index 4a804d2..3045e15 100644 --- a/tests/manual/testbed/TestZoomBlur.qml +++ b/tests/manual/testbed/TestZoomBlur.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 TestCaseTemplate { ImageSource { diff --git a/tests/manual/testbed/testBed.qml b/tests/manual/testbed/testBed.qml index c3e5b91..b74bd1a 100644 --- a/tests/manual/testbed/testBed.qml +++ b/tests/manual/testbed/testBed.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 Rectangle { id: main |