diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-05-29 21:25:00 -0300 | 
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-05-29 21:35:05 -0300 | 
| commit | 3f11d1c821ac52341425e15e37c7e95c32c47a82 (patch) | |
| tree | 1bad831686f1c3e4afc235c71b4fb272b74f82a4 | |
| parent | cfd885163feff37e29c710e15237ef77fd92f6a5 (diff) | |
qt: Silence name collision warnings
| -rw-r--r-- | src/yuzu/configuration/configure_audio.ui | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 18 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input.ui | 6 | 
3 files changed, 15 insertions, 15 deletions
diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui index a29a0e265..a098b9acc 100644 --- a/src/yuzu/configuration/configure_audio.ui +++ b/src/yuzu/configuration/configure_audio.ui @@ -20,7 +20,7 @@        <item>         <layout class="QHBoxLayout">          <item> -         <widget class="QLabel" name="label"> +         <widget class="QLabel" name="label_1">            <property name="text">             <string>Output Engine:</string>            </property> @@ -44,7 +44,7 @@        <item>         <layout class="QHBoxLayout">          <item> -         <widget class="QLabel" name="label"> +         <widget class="QLabel" name="label_2">            <property name="text">             <string>Audio Device:</string>            </property> @@ -61,7 +61,7 @@           <number>0</number>          </property>          <item> -         <widget class="QLabel" name="label"> +         <widget class="QLabel" name="label_3">            <property name="text">             <string>Volume:</string>            </property> diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 758a92335..5ca9ce0e6 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui @@ -45,7 +45,7 @@             </spacer>            </item>            <item> -           <widget class="QLabel" name="label_2"> +           <widget class="QLabel" name="label_1">              <property name="text">               <string>Port:</string>              </property> @@ -70,11 +70,11 @@       <property name="title">        <string>Logging</string>       </property> -     <layout class="QVBoxLayout" name="verticalLayout"> +     <layout class="QVBoxLayout" name="verticalLayout_4">        <item> -       <layout class="QHBoxLayout" name="horizontalLayout"> +       <layout class="QHBoxLayout" name="horizontalLayout_2">          <item> -         <widget class="QLabel" name="label"> +         <widget class="QLabel" name="label_2">            <property name="text">             <string>Global Log Filter</string>            </property> @@ -86,7 +86,7 @@         </layout>        </item>        <item> -       <layout class="QHBoxLayout" name="horizontalLayout_2"> +       <layout class="QHBoxLayout" name="horizontalLayout_3">          <item>           <widget class="QCheckBox" name="toggle_console">            <property name="text"> @@ -111,11 +111,11 @@       <property name="title">        <string>Homebrew</string>       </property> -     <layout class="QVBoxLayout" name="verticalLayout"> +     <layout class="QVBoxLayout" name="verticalLayout_5">        <item> -       <layout class="QHBoxLayout" name="horizontalLayout"> +       <layout class="QHBoxLayout" name="horizontalLayout_4">          <item> -         <widget class="QLabel" name="label"> +         <widget class="QLabel" name="label_3">            <property name="text">             <string>Arguments String</string>            </property> @@ -134,7 +134,7 @@       <property name="title">        <string>Dump</string>       </property> -     <layout class="QVBoxLayout" name="verticalLayout_4"> +     <layout class="QVBoxLayout" name="verticalLayout_6">        <item>         <widget class="QCheckBox" name="dump_decompressed_nso">          <property name="whatsThis"> diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui index 0a2d9f024..8378451c8 100644 --- a/src/yuzu/configuration/configure_input.ui +++ b/src/yuzu/configuration/configure_input.ui @@ -17,7 +17,7 @@     <item>      <layout class="QVBoxLayout" name="verticalLayout">       <item> -      <widget class="QGroupBox" name="gridGroupBox"> +      <widget class="QGroupBox" name="gridGroupBox_1">         <property name="title">          <string>Players</string>         </property> @@ -260,7 +260,7 @@        </widget>       </item>       <item> -      <widget class="QGroupBox" name="gridGroupBox"> +      <widget class="QGroupBox" name="gridGroupBox_2">         <property name="title">          <string>Handheld</string>         </property> @@ -332,7 +332,7 @@        </widget>       </item>       <item> -      <widget class="QGroupBox" name="gridGroupBox"> +      <widget class="QGroupBox" name="gridGroupBox_3">         <property name="title">          <string>Other</string>         </property>  | 
