vlc/vlc-2.1 | branch: master | Ludovic Fauvet <[email protected]> | Wed Jul 10 18:06:42 2013 +0200| [b705fc836046420e0686b70f8accdda65c3b12e4] | committer: Jean-Baptiste Kempf
Qt: fix .ui names conflicts and warnings (cherry picked from commit a028907e13d6017b47d665ba4d1c35cec837caca) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b705fc836046420e0686b70f8accdda65c3b12e4 --- modules/gui/qt4/ui/open.ui | 2 +- modules/gui/qt4/ui/sprefs_audio.ui | 2 +- modules/gui/qt4/ui/sprefs_video.ui | 2 +- modules/gui/qt4/ui/video_effects.ui | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui index e5b8490..ea510db 100644 --- a/modules/gui/qt4/ui/open.ui +++ b/modules/gui/qt4/ui/open.ui @@ -220,7 +220,7 @@ <widget class="Line" name="line"/> </item> <item row="3" column="1" colspan="5"> - <widget class="Line" name="line"/> + <widget class="Line" name="line_1"/> </item> <item row="0" column="4" colspan="2"> <widget class="QTimeEdit" name="startTimeTimeEdit"> diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui index 93b2ac7..367e74c 100644 --- a/modules/gui/qt4/ui/sprefs_audio.ui +++ b/modules/gui/qt4/ui/sprefs_audio.ui @@ -450,7 +450,7 @@ <property name="enabled"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="gridLayout_1"> <property name="margin"> <number>0</number> </property> diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui index 8ce49ba..1f588a5 100644 --- a/modules/gui/qt4/ui/sprefs_video.ui +++ b/modules/gui/qt4/ui/sprefs_video.ui @@ -166,7 +166,7 @@ <property name="title"> <string>Video</string> </property> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="gridLayout_1"> <item row="0" column="0"> <widget class="QLabel" name="deinterLabel"> <property name="text"> diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui index 88a231c..2e3ba58 100644 --- a/modules/gui/qt4/ui/video_effects.ui +++ b/modules/gui/qt4/ui/video_effects.ui @@ -956,7 +956,7 @@ <property name="checked"> <bool>false</bool> </property> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="gridLayout_1"> <item row="0" column="0"> <widget class="QLabel" name="label_19"> <property name="minimumSize"> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
