diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:56:19 +0200 |
| commit | 2282cd01267159a373d7b4a33e768814769d1435 (patch) | |
| tree | db2e1310e4a8eb407e60aa460cde7149bc4cf2b5 /examples/multimediawidgets/camera/camera.ui | |
| parent | 5f56ec9c4f32ff06fb3daa30c0e961997d5fe964 (diff) | |
| parent | 2b343affb7b16ff195bbc8139d2873b183292852 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I5f9bed6cb611471db61b9c69004f16786822625d
Diffstat (limited to 'examples/multimediawidgets/camera/camera.ui')
| -rw-r--r-- | examples/multimediawidgets/camera/camera.ui | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/examples/multimediawidgets/camera/camera.ui b/examples/multimediawidgets/camera/camera.ui index 8a5ee519c..e4ef5d7f0 100644 --- a/examples/multimediawidgets/camera/camera.ui +++ b/examples/multimediawidgets/camera/camera.ui @@ -144,6 +144,10 @@ <property name="text"> <string>Capture Photo</string> </property> + <property name="icon"> + <iconset resource="camera.qrc"> + <normaloff>:/images/shutter.svg</normaloff>:/images/shutter.svg</iconset> + </property> </widget> </item> <item row="1" column="0"> @@ -248,7 +252,7 @@ <x>0</x> <y>0</y> <width>668</width> - <height>25</height> + <height>21</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -300,7 +304,9 @@ <container>1</container> </customwidget> </customwidgets> - <resources/> + <resources> + <include location="camera.qrc"/> + </resources> <connections> <connection> <sender>recordButton</sender> |