diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
| commit | b311ed261a1176c52e68bf8b23bd4040ac12c7c0 (patch) | |
| tree | 8ae99a01cb656d564ac288035516cf5101706a18 /tests/manual | |
| parent | 50576aeb67e1470c9c5d2b52650bede1aa6b5697 (diff) | |
| parent | 0007db13236fcee4ca90b885a67cc7de0f40836d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/quicktemplates2/qquickbuttongroup.cpp
src/quicktemplates2/qquickoverlay.cpp
tests/auto/controls/data/tst_buttongroup.qml
Change-Id: Iae23aaf039c6095007966475294e93220dbead84
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/screenshots/screenshots.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/screenshots/screenshots.qml index 126f02e3..2b031dce 100644 --- a/tests/manual/screenshots/screenshots.qml +++ b/tests/manual/screenshots/screenshots.qml @@ -61,7 +61,7 @@ ApplicationWindow { height: Math.max(600, loader.implicitHeight) property string currentFilePath - property string lastSavePath + property url lastSaveUrl Shortcut { sequence: "Ctrl+Q" @@ -139,8 +139,8 @@ ApplicationWindow { ToolButton { text: "Open Last Screenshot" focusPolicy: Qt.NoFocus - enabled: lastSavePath.length > 0 - onClicked: Qt.openUrlExternally(lastSavePath) + enabled: lastSaveUrl.toString().length > 0 + onClicked: Qt.openUrlExternally(lastSaveUrl) } Item { @@ -159,7 +159,7 @@ ApplicationWindow { var savePath = screenshotsDirStr + "/" + snippetsListView.currentItem.baseName + ".png"; if (result.saveToFile(savePath)) { saveResultToolTip.text = "Successfully saved screenshot to output folder"; - lastSavePath = savePath; + lastSaveUrl = screenshotsDir + "/" + snippetsListView.currentItem.baseName + ".png"; } else { saveResultToolTip.text = "Failed to save screenshot"; } |