Browse Source
Merge pull request #2531 from ReinUsesLisp/qt-warnings
qt: Silence name collision warnings
pull/15/merge
Zach Hilman
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
15 additions and
15 deletions
-
src/yuzu/configuration/configure_audio.ui
-
src/yuzu/configuration/configure_debug.ui
-
src/yuzu/configuration/configure_input.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> |
|
|
|
|
|
|
|
@ -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"> |
|
|
|
|
|
|
|
@ -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> |
|
|
|
|