From 4ba229dfbe840c0dd585336123389506f396238c Mon Sep 17 00:00:00 2001
From: Dmitry Kazakov <dimula73@gmail.com>
Date: Mon, 24 Nov 2014 13:56:22 +0400
Subject: [PATCH] Fix compilation on Qt 4.7

'alignment' is a Qt 4.8 only attribute
---
 krita/plugins/extensions/gmic/wdg_gmic.ui        |  2 +-
 .../filters/colors/wdgcolortoalphabase.ui        |  4 ++--
 .../plugins/formats/jpeg/kis_wdg_options_jpeg.ui |  2 +-
 krita/plugins/paintops/hairy/wdgInkOptions.ui    |  8 ++++----
 .../plugins/paintops/hairy/wdgbristleoptions.ui  | 10 +++++-----
 .../paintops/libpaintop/forms/wdgcurveoption.ui  |  4 ++--
 .../tools/tool_transform2/wdg_tool_transform.ui  | 16 ++++++++--------
 krita/ui/forms/wdgnewimage.ui                    |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/krita/plugins/extensions/gmic/wdg_gmic.ui b/krita/plugins/extensions/gmic/wdg_gmic.ui
index 021955b61c..5230feb01f 100644
--- a/krita/plugins/extensions/gmic/wdg_gmic.ui
+++ b/krita/plugins/extensions/gmic/wdg_gmic.ui
@@ -13,7 +13,7 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QGridLayout" name="m_filterConfigLayout" columnstretch="1,2,2,1">
-     <item row="0" column="0" rowspan="3" alignment="Qt::AlignLeft">
+     <item row="0" column="0" rowspan="3">
       <widget class="KisGmicInputOutputWidget" name="m_inputOutputOptions" native="true"/>
      </item>
      <item row="0" column="1">
diff --git a/krita/plugins/filters/colors/wdgcolortoalphabase.ui b/krita/plugins/filters/colors/wdgcolortoalphabase.ui
index 15887bfdba..21de3d9487 100644
--- a/krita/plugins/filters/colors/wdgcolortoalphabase.ui
+++ b/krita/plugins/filters/colors/wdgcolortoalphabase.ui
@@ -119,7 +119,7 @@
      <property name="verticalSpacing">
       <number>0</number>
      </property>
-     <item row="1" column="0" alignment="Qt::AlignRight">
+     <item row="1" column="0">
       <widget class="QLabel" name="textLabel1_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -148,7 +148,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="0" alignment="Qt::AlignRight">
+     <item row="0" column="0">
       <widget class="QLabel" name="pickerLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
diff --git a/krita/plugins/formats/jpeg/kis_wdg_options_jpeg.ui b/krita/plugins/formats/jpeg/kis_wdg_options_jpeg.ui
index c2b7f84694..f35da3f1bf 100644
--- a/krita/plugins/formats/jpeg/kis_wdg_options_jpeg.ui
+++ b/krita/plugins/formats/jpeg/kis_wdg_options_jpeg.ui
@@ -59,7 +59,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0" alignment="Qt::AlignRight">
+         <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
diff --git a/krita/plugins/paintops/hairy/wdgInkOptions.ui b/krita/plugins/paintops/hairy/wdgInkOptions.ui
index ea49a1632e..6758a94dbd 100644
--- a/krita/plugins/paintops/hairy/wdgInkOptions.ui
+++ b/krita/plugins/paintops/hairy/wdgInkOptions.ui
@@ -161,14 +161,14 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0" alignment="Qt::AlignRight">
+    <item row="2" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Bristle Ink Weight:</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="0" alignment="Qt::AlignRight">
+    <item row="1" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Pressure Weight:</string>
@@ -185,7 +185,7 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="0" alignment="Qt::AlignRight">
+    <item row="3" column="0">
      <widget class="QLabel" name="label_3">
       <property name="text">
        <string>Bristle Length Weight:</string>
@@ -212,7 +212,7 @@
       </property>
      </widget>
     </item>
-    <item row="4" column="0" alignment="Qt::AlignRight">
+    <item row="4" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>Ink Depletion Curve Weight:</string>
diff --git a/krita/plugins/paintops/hairy/wdgbristleoptions.ui b/krita/plugins/paintops/hairy/wdgbristleoptions.ui
index 93942b0e69..88330c383d 100644
--- a/krita/plugins/paintops/hairy/wdgbristleoptions.ui
+++ b/krita/plugins/paintops/hairy/wdgbristleoptions.ui
@@ -167,35 +167,35 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0" alignment="Qt::AlignRight">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Mouse pressure:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0" alignment="Qt::AlignRight">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Threshold:</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0" alignment="Qt::AlignRight">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Connect hairs:</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="0" alignment="Qt::AlignRight">
+     <item row="7" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Anti-aliasing:</string>
        </property>
       </widget>
      </item>
-     <item row="8" column="0" alignment="Qt::AlignRight">
+     <item row="8" column="0">
       <widget class="QLabel" name="label_8">
        <property name="text">
         <string>Composite bristles:</string>
diff --git a/krita/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/krita/plugins/paintops/libpaintop/forms/wdgcurveoption.ui
index 5f7bec6f23..16167dff4e 100644
--- a/krita/plugins/paintops/libpaintop/forms/wdgcurveoption.ui
+++ b/krita/plugins/paintops/libpaintop/forms/wdgcurveoption.ui
@@ -125,7 +125,7 @@
          </property>
         </widget>
        </item>
-       <item alignment="Qt::AlignBottom">
+       <item>
         <widget class="QLabel" name="label_ymin">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -155,7 +155,7 @@
          </property>
         </widget>
        </item>
-       <item alignment="Qt::AlignRight">
+       <item>
         <widget class="QLabel" name="label_xmax">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
diff --git a/krita/plugins/tools/tool_transform2/wdg_tool_transform.ui b/krita/plugins/tools/tool_transform2/wdg_tool_transform.ui
index 1a7c8658cd..176247d3f8 100755
--- a/krita/plugins/tools/tool_transform2/wdg_tool_transform.ui
+++ b/krita/plugins/tools/tool_transform2/wdg_tool_transform.ui
@@ -1383,7 +1383,7 @@
            </attribute>
           </widget>
          </item>
-         <item alignment="Qt::AlignLeft">
+         <item>
           <widget class="QSpinBox" name="densityBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1442,7 +1442,7 @@
            </attribute>
           </widget>
          </item>
-         <item alignment="Qt::AlignLeft">
+         <item>
           <widget class="QWidget" name="customWarpWidget" native="true">
            <property name="enabled">
             <bool>false</bool>
@@ -1695,7 +1695,7 @@
            <property name="verticalSpacing">
             <number>5</number>
            </property>
-           <item row="5" column="0" alignment="Qt::AlignRight">
+           <item row="5" column="0">
             <widget class="QLabel" name="label">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1717,7 +1717,7 @@
            <item row="4" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifySpacingSlider" native="true"/>
            </item>
-           <item row="4" column="0" alignment="Qt::AlignRight">
+           <item row="4" column="0">
             <widget class="QLabel" name="lblSpacing">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1736,7 +1736,7 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="0" alignment="Qt::AlignRight">
+           <item row="3" column="0">
             <widget class="QLabel" name="lblFlow">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1758,7 +1758,7 @@
            <item row="3" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifyFlowSlider" native="true"/>
            </item>
-           <item row="1" column="0" alignment="Qt::AlignRight">
+           <item row="1" column="0">
             <widget class="QLabel" name="lblSize">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1780,7 +1780,7 @@
            <item row="1" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifySizeSlider" native="true"/>
            </item>
-           <item row="2" column="0" alignment="Qt::AlignRight">
+           <item row="2" column="0">
             <widget class="QLabel" name="lblAmount">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1802,7 +1802,7 @@
            <item row="2" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifyAmountSlider" native="true"/>
            </item>
-           <item row="0" column="0" alignment="Qt::AlignRight">
+           <item row="0" column="0">
             <widget class="QLabel" name="label_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
diff --git a/krita/ui/forms/wdgnewimage.ui b/krita/ui/forms/wdgnewimage.ui
index 24839c9f05..0506776215 100644
--- a/krita/ui/forms/wdgnewimage.ui
+++ b/krita/ui/forms/wdgnewimage.ui
@@ -453,7 +453,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" alignment="Qt::AlignRight">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Layers:</string>
-- 
GitLab