diff options
| author | bunnei <bunneidev@gmail.com> | 2017-01-12 10:15:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-12 10:15:12 -0500 |
| commit | 1d088c637cd36a741122d68076a1ff0e9dee9fa8 (patch) | |
| tree | 45fdf7a225da143f679bcf9510b35245c91a1c81 /src | |
| parent | 7ddfd3054dc67fa727ec7c7267f27a438ac37dc3 (diff) | |
| parent | 8d48798f1c25cb4683375548066334a7f774ce1b (diff) | |
Merge pull request #2424 from Kloen/qt-ui-warnings-really
Qt: Fix UI related warnings and bonus ui file format
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/configure_general.ui | 40 | ||||
| -rw-r--r-- | src/citra_qt/configure_graphics.ui | 4 | ||||
| -rw-r--r-- | src/citra_qt/configure_input.ui | 3 |
3 files changed, 23 insertions, 24 deletions
diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui index 342954e415..0f3352a1df 100644 --- a/src/citra_qt/configure_general.ui +++ b/src/citra_qt/configure_general.ui @@ -43,26 +43,26 @@ </layout> </widget> </item> - <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Performance</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="QCheckBox" name="toggle_cpu_jit"> - <property name="text"> - <string>Enable CPU JIT</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Performance</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <item> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QCheckBox" name="toggle_cpu_jit"> + <property name="text"> + <string>Enable CPU JIT</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </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 62021fe228..a091f4c606 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 a040d4df4c..2760787e59 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> |