diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:16:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:16:46 +0100 |
| commit | 0df84b45e5a1e703b86cfcd5374b187aaf866e79 (patch) | |
| tree | 3b874ca818218f0ee69977276ee1f6d210342379 /src/libs/qmleditorwidgets | |
| parent | e54c5149841964d9527b04517441e0d9e64770d8 (diff) | |
| parent | ba859279c3a6d095d5b08253f7f6070a93ec90c0 (diff) | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
src/shared/qbs
Change-Id: Ib734825a302efe41021307d7d64eb7b453262dc4
Diffstat (limited to 'src/libs/qmleditorwidgets')
| -rw-r--r-- | src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui | 2 | ||||
| -rw-r--r-- | src/libs/qmleditorwidgets/images/tile-icon-hor-scale.png (renamed from src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png) | bin | 270 -> 270 bytes | |||
| -rw-r--r-- | src/libs/qmleditorwidgets/resources.qrc | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui index df35b99cdd4..8bd14156cba 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui +++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui @@ -193,7 +193,7 @@ </property> <property name="icon"> <iconset resource="resources.qrc"> - <normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</iconset> + <normaloff>:/qmldesigner/images/tile-icon-hor-scale.png</normaloff>:/qmldesigner/images/tile-icon-hor-scale.png</iconset> </property> <property name="iconSize"> <size> diff --git a/src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png b/src/libs/qmleditorwidgets/images/tile-icon-hor-scale.png Binary files differindex 8db430e9ea7..8db430e9ea7 100644 --- a/src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png +++ b/src/libs/qmleditorwidgets/images/tile-icon-hor-scale.png diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 5ac07864815..d8bea3895c6 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -35,7 +35,7 @@ <file>images/aspect-crop-icon.png</file> <file>images/tile-icon-vert-crop.png</file> <file>images/tile-icon-hor-crop.png</file> - <file>images/tile-icon-hor - scale.png</file> + <file>images/tile-icon-hor-scale.png</file> <file>images/tile-icon-vert-scale.png</file> <file>images/anchor_bottom.png</file> <file>images/anchor_bottom@2x.png</file> |
