diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:25:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:25:02 +0200 |
| commit | dc1d95819365202e2745faffe31e13d928742c4c (patch) | |
| tree | ee45832495cc20d26143fc3ec4f74c3212b0742e /src/extras/designer/PictureSpecifics.qml | |
| parent | 52672d6811eeda364c10fa4d81c2b352e8b1d2e8 (diff) | |
| parent | 22fab1502f562bccb3c16dde0288aa867e3b094a (diff) | |
| download | qtquickcontrols-dc1d95819365202e2745faffe31e13d928742c4c.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5
Diffstat (limited to 'src/extras/designer/PictureSpecifics.qml')
| -rw-r--r-- | src/extras/designer/PictureSpecifics.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/designer/PictureSpecifics.qml b/src/extras/designer/PictureSpecifics.qml index a4c197fd..461e233a 100644 --- a/src/extras/designer/PictureSpecifics.qml +++ b/src/extras/designer/PictureSpecifics.qml @@ -55,7 +55,7 @@ Column { SectionLayout { Label { text: qsTr("Source") - toolTip: qsTr("Source") + tooltip: qsTr("Source") } SecondColumnLayout { LineEdit { |