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

List:       kde-commits
Subject:    [calligra/frameworks] krita/ui: fix more krita build errors
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2015-03-30 14:47:05
Message-ID: E1Ycay1-00088N-NY () scm ! kde ! org
[Download RAW message or body]

Git commit 0c178afb02063e70d0bcf83b0b2d9e2ca3f2bedc by Sven Langkamp.
Committed on 30/03/2015 at 14:46.
Pushed by langkamp into branch 'frameworks'.

fix more krita build errors

M  +1    -1    krita/ui/KisDocument.cpp
M  +1    -1    krita/ui/KisMainWindow.cpp
M  +5    -5    krita/ui/input/wintab/kis_tablet_support.h
M  +1    -0    krita/ui/input/wintab/kis_tablet_support_x11.cpp
M  +1    -1    krita/ui/kis_layer_manager.cc
M  +6    -0    krita/ui/qtsingleapplication/qtsingleapplication.h
M  +1    -0    krita/ui/widgets/kis_multipliers_double_slider_spinbox.cpp

http://commits.kde.org/calligra/0c178afb02063e70d0bcf83b0b2d9e2ca3f2bedc

diff --git a/krita/ui/KisDocument.cpp b/krita/ui/KisDocument.cpp
index 61d96eb..3aa54b0 100644
--- a/krita/ui/KisDocument.cpp
+++ b/krita/ui/KisDocument.cpp
@@ -2620,5 +2620,5 @@ KisUndoStore* KisDocument::createUndoStore()
     return new KisDocumentUndoStore(this);
 }
 
-#include <KisDocument.moc>
+#include <moc_KisDocument.cpp>
 
diff --git a/krita/ui/KisMainWindow.cpp b/krita/ui/KisMainWindow.cpp
index ee13261..c248cc4 100644
--- a/krita/ui/KisMainWindow.cpp
+++ b/krita/ui/KisMainWindow.cpp
@@ -2184,4 +2184,4 @@ void KisMainWindow::showDockerTitleBars(bool show)
 }
 
 
-#include <KisMainWindow.moc>
+#include <moc_KisMainWindow.cpp>
diff --git a/krita/ui/input/wintab/kis_tablet_support.h \
b/krita/ui/input/wintab/kis_tablet_support.h index 8c1b279..192696d 100644
--- a/krita/ui/input/wintab/kis_tablet_support.h
+++ b/krita/ui/input/wintab/kis_tablet_support.h
@@ -28,7 +28,7 @@
 #include <QMap>
 #include <QTabletEvent>
 
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
 #include "kis_config.h"
 #include <algorithm>
 #include <X11/extensions/XInput.h>
@@ -46,7 +46,7 @@ struct QTabletDeviceData
     int maxTanPressure;
     int minX, maxX, minY, maxY, minZ, maxZ;
     int sysOrgX, sysOrgY, sysExtX, sysExtY;
-#ifdef Q_WS_X11 // on windows the scale is fixed (and hardcoded)
+#ifdef Q_OS_UNIX // on windows the scale is fixed (and hardcoded)
     int minRotation;
     int maxRotation;
 #endif /* Q_WS_X11 */
@@ -54,11 +54,11 @@ struct QTabletDeviceData
                               int outOriginY, int outExtentY) const;
 #endif
 
-#if defined(Q_WS_X11) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA))
+#if defined(Q_OS_UNIX) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA))
     QPointer<QWidget> widgetToGetPress;
 #endif
 
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     int deviceType;
     enum {
         TOTAL_XINPUT_EVENTS = 64
@@ -90,7 +90,7 @@ struct QTabletDeviceData
     QMap<quint8, quint8> buttonsMap;
 #endif
 
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     bool isTouchWacomTablet;
 
     /**
diff --git a/krita/ui/input/wintab/kis_tablet_support_x11.cpp \
b/krita/ui/input/wintab/kis_tablet_support_x11.cpp index 0e28671..d578f71 100644
--- a/krita/ui/input/wintab/kis_tablet_support_x11.cpp
+++ b/krita/ui/input/wintab/kis_tablet_support_x11.cpp
@@ -30,6 +30,7 @@
 #include "wacom-properties.h"
 
 #include <input/kis_tablet_debugger.h>
+#include <X11/extensions/XInput.h>
 
 
 /**
diff --git a/krita/ui/kis_layer_manager.cc b/krita/ui/kis_layer_manager.cc
index 62ec8c1..cf13602 100644
--- a/krita/ui/kis_layer_manager.cc
+++ b/krita/ui/kis_layer_manager.cc
@@ -903,4 +903,4 @@ void KisLayerManager::addFileLayer(KisNodeSP activeNode)
 
 }
 
-
+#include "moc_kis_layer_manager.cpp"
diff --git a/krita/ui/qtsingleapplication/qtsingleapplication.h \
b/krita/ui/qtsingleapplication/qtsingleapplication.h index b0122f1..5f10c3b 100644
--- a/krita/ui/qtsingleapplication/qtsingleapplication.h
+++ b/krita/ui/qtsingleapplication/qtsingleapplication.h
@@ -28,6 +28,10 @@
 **
 ****************************************************************************/
 
+#ifndef QTSINGLEAPPLICATION
+#define QTSINGLEAPPLICATION
+
+
 #include <QApplication>
 #include <kapplication.h>
 
@@ -72,3 +76,5 @@ private:
     QString appId;
     bool block;
 };
+
+#endif
diff --git a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.cpp \
b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.cpp index dee8c1f..01c7fec \
                100644
--- a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
+++ b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
@@ -91,3 +91,4 @@ void KisMultipliersDoubleSliderSpinBox::setExponentRatio(qreal dbl)
     d->form.sliderSpinBox->setExponentRatio(dbl);
 }
 
+#include "moc_kis_multipliers_double_slider_spinbox.cpp"
\ No newline at end of file


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