diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
| commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
| tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /examples/quickcontrols/controls/texteditor/qml/main.qml | |
| parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
| parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'examples/quickcontrols/controls/texteditor/qml/main.qml')
| -rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/main.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quickcontrols/controls/texteditor/qml/main.qml b/examples/quickcontrols/controls/texteditor/qml/main.qml index 8aa9ee7be..1544ebc90 100644 --- a/examples/quickcontrols/controls/texteditor/qml/main.qml +++ b/examples/quickcontrols/controls/texteditor/qml/main.qml @@ -93,7 +93,7 @@ ApplicationWindow { id: pasteAction text: "Paste" shortcut: "ctrl+v" - iconSource: "qrc:images/editpaste.png" + iconSource: "images/editpaste.png" iconName: "edit-paste" onTriggered: textArea.paste() } |