[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-testing-kazakov] krita: Fix compilation on Qt 4.7
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-05-25 10:40:43
Message-ID: E1WoVr9-0006i5-Bx () scm ! kde ! org
[Download RAW message or body]

Git commit bd7bd8b367c7dd7d5c745e5621b4bb05db715010 by Dmitry Kazakov.
Committed on 25/05/2014 at 07:10.
Pushed by dkazakov into branch 'krita-testing-kazakov'.

Fix compilation on Qt 4.7

M  +6    -6    krita/plugins/filters/indexcolors/kiswdgindexcolors.ui
M  +1    -0    krita/ui/kis_tooltip_manager.cpp
M  +1    -0    krita/ui/opengl/kis_opengl_canvas2.cpp

http://commits.kde.org/calligra/bd7bd8b367c7dd7d5c745e5621b4bb05db715010

diff --git a/krita/plugins/filters/indexcolors/kiswdgindexcolors.ui \
b/krita/plugins/filters/indexcolors/kiswdgindexcolors.ui index df9c7d9..1cc14fe \
                100644
--- a/krita/plugins/filters/indexcolors/kiswdgindexcolors.ui
+++ b/krita/plugins/filters/indexcolors/kiswdgindexcolors.ui
@@ -14,7 +14,7 @@
    <property name="margin">
     <number>0</number>
    </property>
-   <item row="0" column="0" alignment="Qt::AlignLeft">
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Ramps</string>
@@ -23,7 +23,7 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="1" column="0" alignment="Qt::AlignLeft">
+      <item row="1" column="0">
        <widget class="QWidget" name="colorsBox" native="true">
         <property name="minimumSize">
          <size>
@@ -54,7 +54,7 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" alignment="Qt::AlignLeft">
+   <item row="2" column="0">
     <widget class="QGroupBox" name="gradientStepsBox">
      <property name="title">
       <string>Gradient Steps</string>
@@ -109,7 +109,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" alignment="Qt::AlignLeft">
+      <item row="1" column="0" colspan="2">
        <widget class="QWidget" name="widget" native="true">
         <property name="minimumSize">
          <size>
@@ -144,7 +144,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
+   <item row="3" column="0">
     <widget class="QGroupBox" name="indexingBox">
      <property name="title">
       <string>Indexing Factors</string>
@@ -268,7 +268,7 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" alignment="Qt::AlignLeft">
+   <item row="4" column="0">
     <widget class="QGroupBox" name="otherBox">
      <property name="title">
       <string>Other</string>
diff --git a/krita/ui/kis_tooltip_manager.cpp b/krita/ui/kis_tooltip_manager.cpp
index 8220324..5a0700a 100644
--- a/krita/ui/kis_tooltip_manager.cpp
+++ b/krita/ui/kis_tooltip_manager.cpp
@@ -18,6 +18,7 @@
 
 #include "kis_tooltip_manager.h"
 
+#include <QFile>
 #include <QAction>
 #include <QInputDialog>
 #include <QDomDocument>
diff --git a/krita/ui/opengl/kis_opengl_canvas2.cpp \
b/krita/ui/opengl/kis_opengl_canvas2.cpp index 6cc1a2a..ba2763d 100644
--- a/krita/ui/opengl/kis_opengl_canvas2.cpp
+++ b/krita/ui/opengl/kis_opengl_canvas2.cpp
@@ -22,6 +22,7 @@
 
 #ifdef HAVE_OPENGL
 
+#include <QFile>
 #include <QMenu>
 #include <QWidget>
 #include <QBrush>


[prev in list] [next in list] [prev in thread] [next in thread]