Skip to content
Snippets Groups Projects
Unverified Commit 433ca686 authored by Zach Hilman's avatar Zach Hilman Committed by GitHub
Browse files

Merge pull request #2531 from ReinUsesLisp/qt-warnings

qt: Silence name collision warnings
parents 6ce5f3e1 3f11d1c8
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_1">
<property name="text"> <property name="text">
<string>Output Engine:</string> <string>Output Engine:</string>
</property> </property>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Audio Device:</string> <string>Audio Device:</string>
</property> </property>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Volume:</string> <string>Volume:</string>
</property> </property>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_1">
<property name="text"> <property name="text">
<string>Port:</string> <string>Port:</string>
</property> </property>
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
<property name="title"> <property name="title">
<string>Logging</string> <string>Logging</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Global Log Filter</string> <string>Global Log Filter</string>
</property> </property>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QCheckBox" name="toggle_console"> <widget class="QCheckBox" name="toggle_console">
<property name="text"> <property name="text">
...@@ -111,11 +111,11 @@ ...@@ -111,11 +111,11 @@
<property name="title"> <property name="title">
<string>Homebrew</string> <string>Homebrew</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Arguments String</string> <string>Arguments String</string>
</property> </property>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<property name="title"> <property name="title">
<string>Dump</string> <string>Dump</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<widget class="QCheckBox" name="dump_decompressed_nso"> <widget class="QCheckBox" name="dump_decompressed_nso">
<property name="whatsThis"> <property name="whatsThis">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="gridGroupBox"> <widget class="QGroupBox" name="gridGroupBox_1">
<property name="title"> <property name="title">
<string>Players</string> <string>Players</string>
</property> </property>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="gridGroupBox"> <widget class="QGroupBox" name="gridGroupBox_2">
<property name="title"> <property name="title">
<string>Handheld</string> <string>Handheld</string>
</property> </property>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="gridGroupBox"> <widget class="QGroupBox" name="gridGroupBox_3">
<property name="title"> <property name="title">
<string>Other</string> <string>Other</string>
</property> </property>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment