FIX #19903 Limit amount of fonts used in QGIS

qgis · Apr 2, 2020 · 8836429 · 8836429
1 parent 3094534
commit 8836429
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/src/ui/labeling/qgslabelpropertydialogbase.ui b/src/ui/labeling/qgslabelpropertydialogbase.ui
@@ -113,11 +113,7 @@
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0" colspan="3">
-           <widget class="QFontComboBox" name="mFontFamilyCmbBx">
-            <property name="editable">
-             <bool>false</bool>
-            </property>
-           </widget>
+           <widget class="QFontComboBox" name="mFontFamilyCmbBx" />
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_3">

diff --git a/src/ui/qgseditconditionalformatrulewidget.ui b/src/ui/qgseditconditionalformatrulewidget.ui
@@ -317,11 +317,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QFontComboBox" name="mFontFamilyCmbBx">
-          <property name="editable">
-           <bool>false</bool>
-          </property>
-         </widget>
+         <widget class="QFontComboBox" name="mFontFamilyCmbBx" />
         </item>
        </layout>
       </item>

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -606,11 +606,7 @@
                      </widget>
                     </item>
                     <item>
-                     <widget class="QFontComboBox" name="mFontFamilyComboBox">
-                      <property name="enabled">
-                       <bool>false</bool>
-                      </property>
-                     </widget>
+                     <widget class="QFontComboBox" name="mFontFamilyComboBox" />
                     </item>
                     <item>
                      <widget class="QLabel" name="label_20">

diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui
@@ -1144,9 +1144,6 @@
                          </item>
                          <item row="1" column="1">
                           <widget class="QFontComboBox" name="mFontFamilyCmbBx">
-                           <property name="editable">
-                            <bool>false</bool>
-                           </property>
                            <property name="sizeAdjustPolicy">
                             <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
                            </property>