Merge remote-tracking branch 'origin/Applications/16.12'

KDE · Jan 11, 2017 · 9ab64d5 · 9ab64d5
2 parents 845bb80 + 87e5a58
commit 9ab64d5
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/settings.ui b/settings.ui
@@ -393,11 +393,7 @@
               </widget>
              </item>
              <item>
-              <widget class="KColorButton" name="kcfg_Color1">
-               <property name="text">
-                <string>PushButton</string>
-               </property>
-              </widget>
+              <widget class="KColorButton" name="kcfg_Color1"/>
              </item>
             </layout>
            </item>
@@ -411,11 +407,7 @@
               </widget>
              </item>
              <item>
-              <widget class="KColorButton" name="kcfg_Color2">
-               <property name="text">
-                <string>PushButton</string>
-               </property>
-              </widget>
+              <widget class="KColorButton" name="kcfg_Color2"/>
              </item>
             </layout>
            </item>
@@ -429,11 +421,7 @@
               </widget>
              </item>
              <item>
-              <widget class="KColorButton" name="kcfg_Color0">
-               <property name="text">
-                <string>PushButton</string>
-               </property>
-              </widget>
+              <widget class="KColorButton" name="kcfg_Color0"/>
              </item>
             </layout>
            </item>