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/videosettings.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/videosettings.ui')
| -rw-r--r-- | examples/multimediawidgets/camera/videosettings.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/multimediawidgets/camera/videosettings.ui b/examples/multimediawidgets/camera/videosettings.ui index f6aa004c5..940b7db7a 100644 --- a/examples/multimediawidgets/camera/videosettings.ui +++ b/examples/multimediawidgets/camera/videosettings.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Dialog</string> + <string>Video Settings</string> </property> <layout class="QGridLayout" name="gridLayout_4"> <item row="0" column="0"> |