Merge pull request #2424 from Kloen/qt-ui-warnings-really

Qt: Fix UI related warnings and bonus ui file format
author: bunnei 2017-01-12 10:15:12 -0500
committer: GitHub 2017-01-12 10:15:12 -0500
commit: 1d088c637cd36a741122d68076a1ff0e9dee9fa8 (patch)
tree: 45fdf7a225da143f679bcf9510b35245c91a1c81
parent: Merge pull request #2425 from Subv/cleanup_todos (diff)
parent: QT: Fix ui file format (diff)
download: yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.tar.gz
yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.tar.xz
yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.zip
3 files changed, 23 insertions, 24 deletions
diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui
index 342954e41..0f3352a1d 100644
--- a/src/citra_qt/configure_general.ui
+++ b/src/citra_qt/configure_general.ui
@@ -43,26 +43,26 @@
       </layout>
      </widget>
     </item>
-      <item>
+     <item>
-        <widget class="QGroupBox" name="groupBox_2">
+       <widget class="QGroupBox" name="groupBox_2">
-          <property name="title">
+         <property name="title">
-            <string>Performance</string>
+           <string>Performance</string>
-          </property>
+         </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <item>
+           <item>
-              <layout class="QVBoxLayout" name="verticalLayout_5">
+             <layout class="QVBoxLayout" name="verticalLayout_5">
-                <item>
+               <item>
-                  <widget class="QCheckBox" name="toggle_cpu_jit">
+                 <widget class="QCheckBox" name="toggle_cpu_jit">
-                    <property name="text">
+                   <property name="text">
-                      <string>Enable CPU JIT</string>
+                     <string>Enable CPU JIT</string>
-                    </property>
+                   </property>
-                  </widget>
+                 </widget>
-                </item>
+               </item>
-              </layout>
+             </layout>
-            </item>
+           </item>
-          </layout>
+         </layout>
-        </widget>
+       </widget>
-      </item>
+     </item>
     <item>
      <widget class="QGroupBox" name="groupBox_4">
       <property name="title">
diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui
index 62021fe22..a091f4c60 100644
--- a/src/citra_qt/configure_graphics.ui
+++ b/src/citra_qt/configure_graphics.ui
@@ -132,9 +132,9 @@
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QLabel" name="label1">
            <property name="text">
diff --git a/src/citra_qt/configure_input.ui b/src/citra_qt/configure_input.ui
index a040d4df4..2760787e5 100644
--- a/src/citra_qt/configure_input.ui
+++ b/src/citra_qt/configure_input.ui
@@ -275,7 +275,6 @@
         </layout>
        </item>
       </layout>
-       <zorder></zorder>
      </widget>
     </item>
     <item row="1" column="1">
@@ -521,7 +520,7 @@
        <item row="1" column="1">
         <layout class="QVBoxLayout" name="verticalLayout_28">
          <item>
-           <widget class="QLabel" name="label_34">
+           <widget class="QLabel" name="label_36">
            <property name="text">
             <string>Circle Mod:</string>
            </property>
author	bunnei	2017-01-12 10:15:12 -0500
committer	GitHub	2017-01-12 10:15:12 -0500
commit	1d088c637cd36a741122d68076a1ff0e9dee9fa8 (patch)
tree	45fdf7a225da143f679bcf9510b35245c91a1c81
parent	Merge pull request #2425 from Subv/cleanup_todos (diff)
parent	QT: Fix ui file format (diff)
download	yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.tar.gz yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.tar.xz yuzu-1d088c637cd36a741122d68076a1ff0e9dee9fa8.zip

diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui index 342954e41..0f3352a1d 100644 --- a/src/citra_qt/configure_general.ui +++ b/src/citra_qt/configure_general.ui
@@ -43,26 +43,26 @@
43	</layout>	43	</layout>
44	</widget>	44	</widget>
45	</item>	45	</item>
46	<item>	46	<item>
47	<widget class="QGroupBox" name="groupBox_2">	47	<widget class="QGroupBox" name="groupBox_2">
48	<property name="title">	48	<property name="title">
49	<string>Performance</string>	49	<string>Performance</string>
50	</property>	50	</property>
51	<layout class="QHBoxLayout" name="horizontalLayout_7">	51	<layout class="QHBoxLayout" name="horizontalLayout_7">
52	<item>	52	<item>
53	<layout class="QVBoxLayout" name="verticalLayout_5">	53	<layout class="QVBoxLayout" name="verticalLayout_5">
54	<item>	54	<item>
55	<widget class="QCheckBox" name="toggle_cpu_jit">	55	<widget class="QCheckBox" name="toggle_cpu_jit">
56	<property name="text">	56	<property name="text">
57	<string>Enable CPU JIT</string>	57	<string>Enable CPU JIT</string>
58	</property>	58	</property>
59	</widget>	59	</widget>
60	</item>	60	</item>
61	</layout>	61	</layout>
62	</item>	62	</item>
63	</layout>	63	</layout>
64	</widget>	64	</widget>
65	</item>	65	</item>
66	<item>	66	<item>
67	<widget class="QGroupBox" name="groupBox_4">	67	<widget class="QGroupBox" name="groupBox_4">
68	<property name="title">	68	<property name="title">


diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui index 62021fe22..a091f4c60 100644 --- a/src/citra_qt/configure_graphics.ui +++ b/src/citra_qt/configure_graphics.ui
@@ -132,9 +132,9 @@
132	</property>	132	</property>
133	<layout class="QHBoxLayout" name="horizontalLayout_3">	133	<layout class="QHBoxLayout" name="horizontalLayout_3">
134	<item>	134	<item>
135	<layout class="QVBoxLayout" name="verticalLayout_2">	135	<layout class="QVBoxLayout" name="verticalLayout_4">
136	<item>	136	<item>
137	<layout class="QHBoxLayout" name="horizontalLayout_3">	137	<layout class="QHBoxLayout" name="horizontalLayout_4">
138	<item>	138	<item>
139	<widget class="QLabel" name="label1">	139	<widget class="QLabel" name="label1">
140	<property name="text">	140	<property name="text">


diff --git a/src/citra_qt/configure_input.ui b/src/citra_qt/configure_input.ui index a040d4df4..2760787e5 100644 --- a/src/citra_qt/configure_input.ui +++ b/src/citra_qt/configure_input.ui
@@ -275,7 +275,6 @@
275	</layout>	275	</layout>
276	</item>	276	</item>
277	</layout>	277	</layout>
278	<zorder></zorder>
279	</widget>	278	</widget>
280	</item>	279	</item>
281	<item row="1" column="1">	280	<item row="1" column="1">
@@ -521,7 +520,7 @@
521	<item row="1" column="1">	520	<item row="1" column="1">
522	<layout class="QVBoxLayout" name="verticalLayout_28">	521	<layout class="QVBoxLayout" name="verticalLayout_28">
523	<item>	522	<item>
524	<widget class="QLabel" name="label_34">	523	<widget class="QLabel" name="label_36">
525	<property name="text">	524	<property name="text">
526	<string>Circle Mod:</string>	525	<string>Circle Mod:</string>
527	</property>	526	</property>