diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2015-03-16 10:14:08 +0100 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2015-03-16 10:14:08 +0100 |
| commit | 3525fb3001a1929f1a4acca28a4189592e404b23 (patch) | |
| tree | a54b72129aa97a85be0cf47131772ac833159a41 | |
| parent | 23c1a715f1233085b2ff91eb41ca077b6b9636b1 (diff) | |
providers:checkbox:jobs: Run qmlscene with -qt5 to avoid running the qt4 version
Fixes https://bugs.launchpad.net/cdts/+bug/1407878
| -rw-r--r-- | jobs/graphics-legacy.txt.in | 2 | ||||
| -rw-r--r-- | jobs/graphics.txt.in | 2 | ||||
| -rw-r--r-- | jobs/touchscreen.txt.in | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/jobs/graphics-legacy.txt.in b/jobs/graphics-legacy.txt.in index 02c9ef6..9c2ef40 100644 --- a/jobs/graphics-legacy.txt.in +++ b/jobs/graphics-legacy.txt.in @@ -44,7 +44,7 @@ id: graphics/screen-resolution requires: device.category == 'VIDEO' package.name == 'qmlscene' -command: qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml +command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml estimated_duration: 10.0 _summary: Test default resolution _description: diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in index b2cd951..340b68f 100644 --- a/jobs/graphics.txt.in +++ b/jobs/graphics.txt.in @@ -101,7 +101,7 @@ command: requires: device.category == 'VIDEO' package.name == 'qmlscene' - command: qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml + command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml estimated_duration: 10.0 _summary: Test default resolution for $product _description: diff --git a/jobs/touchscreen.txt.in b/jobs/touchscreen.txt.in index f18adfe..1069111 100644 --- a/jobs/touchscreen.txt.in +++ b/jobs/touchscreen.txt.in @@ -57,7 +57,7 @@ plugin: user-interact-verify id: touchscreen/multitouch-zoom _summary: Check touchscreen pinch gesture for zoom depends: touchscreen/multitouch-automated -command: qmlscene $PLAINBOX_PROVIDER_DATA/touch_zoom_test.qml 2>&1 |grep -o PASS +command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_zoom_test.qml 2>&1 |grep -o PASS estimated_duration: 120.0 _description: PURPOSE: @@ -72,7 +72,7 @@ plugin: user-interact-verify id: touchscreen/multitouch-rotate _summary: Check touchscreen pinch gesture for rotate depends: touchscreen/multitouch-automated -command: qmlscene $PLAINBOX_PROVIDER_DATA/touch_rotate_test.qml 2>&1 |grep -o PASS +command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_rotate_test.qml 2>&1 |grep -o PASS estimated_duration: 120.0 _description: PURPOSE: @@ -122,7 +122,7 @@ _description: Did you see the green circles around the three fingers? command: manage_compiz_plugin unityshell disable - qmlscene $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=3 2>&1 | grep -o PASS + qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=3 2>&1 | grep -o PASS EXIT=$? manage_compiz_plugin unityshell enable exit $EXIT @@ -141,7 +141,7 @@ _description: Did you see the green circles around the four fingers? command: manage_compiz_plugin unityshell disable - qmlscene $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=4 2>&1 | grep -o PASS + qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=4 2>&1 | grep -o PASS EXIT=$? manage_compiz_plugin unityshell enable exit $EXIT |