Merge pull request #93 from astrofrog/fix-qt6

Fix compatibility of .ui files with Qt6
glue-viz · Jan 12, 2023 · 02379d0 · 02379d0
2 parents c092fc0 + 5930232
commit 02379d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/glue_wwt/viewer/options_widget.ui b/glue_wwt/viewer/options_widget.ui
@@ -38,7 +38,7 @@
  </sizepolicy>
  </property>
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -151,14 +151,14 @@
  </sizepolicy>
  </property>
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
  <item row="1" column="1">
  <widget class="QComboBox" name="combosel_frame">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -175,7 +175,7 @@
  <item row="0" column="1">
  <widget class="QComboBox" name="combosel_mode">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -195,14 +195,14 @@
  <item row="3" column="1">
  <widget class="QComboBox" name="combosel_lat_att">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
  <item row="2" column="1">
  <widget class="QComboBox" name="combosel_lon_att">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -253,7 +253,7 @@
  <item row="5" column="1">
  <widget class="QComboBox" name="combosel_alt_unit">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>

diff --git a/glue_wwt/viewer/table_style_editor.ui b/glue_wwt/viewer/table_style_editor.ui
@@ -88,7 +88,7 @@
  <item>
  <widget class="QComboBox" name="combosel_size_att">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -240,7 +240,7 @@
  <item>
  <widget class="QComboBox" name="combosel_cmap_att">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>
@@ -326,7 +326,7 @@
  <item>
  <widget class="QColormapCombo" name="combodata_cmap">
  <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
  </property>
  </widget>
  </item>