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

Qt: Fix UI related warnings and bonus ui file format

Merge pull request #2424 from Kloen/qt-ui-warnings-really
Qt: Fix UI related warnings and bonus ui file format
1d088c63 · bunnei · GitHub · 7ddfd305 · 8d48798f · 1d088c63
Commit 1d088c63 authored 8 years ago by bunnei Committed by GitHub 8 years ago
--- 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">

--- 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">

--- 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>