Skip to content

V
vlc-2-2
Commit 6576b0b2 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Compilation fix for Qt4.2

parent 163fe44a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 51 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ 6576b0b2
......@@ -261,6 +261,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
optionWidgets.append( ui.fileControl );
optionWidgets.append( ui.outputModule );
optionWidgets.append( ui.volNormBox );
/*Little mofification of ui.volumeValue to compile with Qt < 4.3 */
#ifdef QT43
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
#endif
optionWidgets.append( ui.volumeValue );
updateAudioOptions( ui.outputModule->currentIndex() );
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 6576b0b2
......@@ -79,9 +79,6 @@
<property name="readOnly" >
<bool>true</bool>
</property>
<property name="buttonSymbols" >
<enum>QAbstractSpinBox::NoButtons</enum>
</property>
<property name="suffix" >
<string> %</string>
</property>
......@@ -168,18 +165,6 @@
<item row="1" column="0" colspan="2" >
<widget class="QWidget" native="1" name="alsaControl" >
<layout class="QHBoxLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="alsaLabel" >
<property name="minimumSize" >
......@@ -209,18 +194,6 @@
<item row="2" column="0" colspan="2" >
<widget class="QWidget" native="1" name="DirectXControl" >
<layout class="QHBoxLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="DirectXLabel" >
<property name="sizePolicy" >
......@@ -256,18 +229,6 @@
<item row="3" column="0" colspan="2" >
<widget class="QWidget" native="1" name="OSSControl" >
<layout class="QHBoxLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="OSSLabel" >
<property name="minimumSize" >
......@@ -297,18 +258,6 @@
<item row="4" column="0" colspan="2" >
<widget class="QWidget" native="1" name="fileControl" >
<layout class="QHBoxLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="fileLabel" >
<property name="minimumSize" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment