diff options
| author | 2019-06-05 15:27:12 -0400 | |
|---|---|---|
| committer | 2019-06-05 15:27:12 -0400 | |
| commit | 433ca686a8307bddca8b828dbaf1c7e37513cde0 (patch) | |
| tree | a72453b6612454fc743cb45fb7f21cd5b556a5de /src | |
| parent | Merge pull request #2515 from lioncash/narrowing (diff) | |
| parent | qt: Silence name collision warnings (diff) | |
| download | yuzu-433ca686a8307bddca8b828dbaf1c7e37513cde0.tar.gz yuzu-433ca686a8307bddca8b828dbaf1c7e37513cde0.tar.xz yuzu-433ca686a8307bddca8b828dbaf1c7e37513cde0.zip | |
Merge pull request #2531 from ReinUsesLisp/qt-warnings
qt: Silence name collision warnings
Diffstat (limited to 'src')
| -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 @@ | |||
| 20 | <item> | 20 | <item> |
| 21 | <layout class="QHBoxLayout"> | 21 | <layout class="QHBoxLayout"> |
| 22 | <item> | 22 | <item> |
| 23 | <widget class="QLabel" name="label"> | 23 | <widget class="QLabel" name="label_1"> |
| 24 | <property name="text"> | 24 | <property name="text"> |
| 25 | <string>Output Engine:</string> | 25 | <string>Output Engine:</string> |
| 26 | </property> | 26 | </property> |
| @@ -44,7 +44,7 @@ | |||
| 44 | <item> | 44 | <item> |
| 45 | <layout class="QHBoxLayout"> | 45 | <layout class="QHBoxLayout"> |
| 46 | <item> | 46 | <item> |
| 47 | <widget class="QLabel" name="label"> | 47 | <widget class="QLabel" name="label_2"> |
| 48 | <property name="text"> | 48 | <property name="text"> |
| 49 | <string>Audio Device:</string> | 49 | <string>Audio Device:</string> |
| 50 | </property> | 50 | </property> |
| @@ -61,7 +61,7 @@ | |||
| 61 | <number>0</number> | 61 | <number>0</number> |
| 62 | </property> | 62 | </property> |
| 63 | <item> | 63 | <item> |
| 64 | <widget class="QLabel" name="label"> | 64 | <widget class="QLabel" name="label_3"> |
| 65 | <property name="text"> | 65 | <property name="text"> |
| 66 | <string>Volume:</string> | 66 | <string>Volume:</string> |
| 67 | </property> | 67 | </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 @@ | |||
| 45 | </spacer> | 45 | </spacer> |
| 46 | </item> | 46 | </item> |
| 47 | <item> | 47 | <item> |
| 48 | <widget class="QLabel" name="label_2"> | 48 | <widget class="QLabel" name="label_1"> |
| 49 | <property name="text"> | 49 | <property name="text"> |
| 50 | <string>Port:</string> | 50 | <string>Port:</string> |
| 51 | </property> | 51 | </property> |
| @@ -70,11 +70,11 @@ | |||
| 70 | <property name="title"> | 70 | <property name="title"> |
| 71 | <string>Logging</string> | 71 | <string>Logging</string> |
| 72 | </property> | 72 | </property> |
| 73 | <layout class="QVBoxLayout" name="verticalLayout"> | 73 | <layout class="QVBoxLayout" name="verticalLayout_4"> |
| 74 | <item> | 74 | <item> |
| 75 | <layout class="QHBoxLayout" name="horizontalLayout"> | 75 | <layout class="QHBoxLayout" name="horizontalLayout_2"> |
| 76 | <item> | 76 | <item> |
| 77 | <widget class="QLabel" name="label"> | 77 | <widget class="QLabel" name="label_2"> |
| 78 | <property name="text"> | 78 | <property name="text"> |
| 79 | <string>Global Log Filter</string> | 79 | <string>Global Log Filter</string> |
| 80 | </property> | 80 | </property> |
| @@ -86,7 +86,7 @@ | |||
| 86 | </layout> | 86 | </layout> |
| 87 | </item> | 87 | </item> |
| 88 | <item> | 88 | <item> |
| 89 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | 89 | <layout class="QHBoxLayout" name="horizontalLayout_3"> |
| 90 | <item> | 90 | <item> |
| 91 | <widget class="QCheckBox" name="toggle_console"> | 91 | <widget class="QCheckBox" name="toggle_console"> |
| 92 | <property name="text"> | 92 | <property name="text"> |
| @@ -111,11 +111,11 @@ | |||
| 111 | <property name="title"> | 111 | <property name="title"> |
| 112 | <string>Homebrew</string> | 112 | <string>Homebrew</string> |
| 113 | </property> | 113 | </property> |
| 114 | <layout class="QVBoxLayout" name="verticalLayout"> | 114 | <layout class="QVBoxLayout" name="verticalLayout_5"> |
| 115 | <item> | 115 | <item> |
| 116 | <layout class="QHBoxLayout" name="horizontalLayout"> | 116 | <layout class="QHBoxLayout" name="horizontalLayout_4"> |
| 117 | <item> | 117 | <item> |
| 118 | <widget class="QLabel" name="label"> | 118 | <widget class="QLabel" name="label_3"> |
| 119 | <property name="text"> | 119 | <property name="text"> |
| 120 | <string>Arguments String</string> | 120 | <string>Arguments String</string> |
| 121 | </property> | 121 | </property> |
| @@ -134,7 +134,7 @@ | |||
| 134 | <property name="title"> | 134 | <property name="title"> |
| 135 | <string>Dump</string> | 135 | <string>Dump</string> |
| 136 | </property> | 136 | </property> |
| 137 | <layout class="QVBoxLayout" name="verticalLayout_4"> | 137 | <layout class="QVBoxLayout" name="verticalLayout_6"> |
| 138 | <item> | 138 | <item> |
| 139 | <widget class="QCheckBox" name="dump_decompressed_nso"> | 139 | <widget class="QCheckBox" name="dump_decompressed_nso"> |
| 140 | <property name="whatsThis"> | 140 | <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 @@ | |||
| 17 | <item> | 17 | <item> |
| 18 | <layout class="QVBoxLayout" name="verticalLayout"> | 18 | <layout class="QVBoxLayout" name="verticalLayout"> |
| 19 | <item> | 19 | <item> |
| 20 | <widget class="QGroupBox" name="gridGroupBox"> | 20 | <widget class="QGroupBox" name="gridGroupBox_1"> |
| 21 | <property name="title"> | 21 | <property name="title"> |
| 22 | <string>Players</string> | 22 | <string>Players</string> |
| 23 | </property> | 23 | </property> |
| @@ -260,7 +260,7 @@ | |||
| 260 | </widget> | 260 | </widget> |
| 261 | </item> | 261 | </item> |
| 262 | <item> | 262 | <item> |
| 263 | <widget class="QGroupBox" name="gridGroupBox"> | 263 | <widget class="QGroupBox" name="gridGroupBox_2"> |
| 264 | <property name="title"> | 264 | <property name="title"> |
| 265 | <string>Handheld</string> | 265 | <string>Handheld</string> |
| 266 | </property> | 266 | </property> |
| @@ -332,7 +332,7 @@ | |||
| 332 | </widget> | 332 | </widget> |
| 333 | </item> | 333 | </item> |
| 334 | <item> | 334 | <item> |
| 335 | <widget class="QGroupBox" name="gridGroupBox"> | 335 | <widget class="QGroupBox" name="gridGroupBox_3"> |
| 336 | <property name="title"> | 336 | <property name="title"> |
| 337 | <string>Other</string> | 337 | <string>Other</string> |
| 338 | </property> | 338 | </property> |