patch attached
I do not have a revewboard account
REgards, Treeve
From 21d16e2a0e0c6df8a5970b0c7d9980be3488ce52 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <tre...@sourcemage.org>
Date: Sun, 22 Mar 2015 19:47:47 +0100
Subject: [PATCH 2/3] qt5.5. fixes 1. explicit includes for some qt stuff 2.
if qIsNaNPoint is referenced by an assert, it must always be declared, so
remove the #ifndef QT_NO_DEBUG
---
libs/flake/KoGridData.h | 1 +
libs/flake/KoPathPoint.cpp | 2 --
libs/flake/KoPathShape.cpp | 2 --
libs/widgetutils/KoProperties.cpp | 1 +
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libs/flake/KoGridData.h b/libs/flake/KoGridData.h
index 19acb74..1436967 100644
--- a/libs/flake/KoGridData.h
+++ b/libs/flake/KoGridData.h
@@ -24,6 +24,7 @@
#include "flake_export.h"
#include <KoXmlReaderForward.h>
#include <QColor>
+#include <QWidget>
class QPainter;
class QRectF;
diff --git a/libs/flake/KoPathPoint.cpp b/libs/flake/KoPathPoint.cpp
index 5ae4554..0a2fefa 100644
--- a/libs/flake/KoPathPoint.cpp
+++ b/libs/flake/KoPathPoint.cpp
@@ -28,12 +28,10 @@
#include <math.h>
-#ifndef QT_NO_DEBUG
#include <qnumeric.h> // for qIsNaN
static bool qIsNaNPoint(const QPointF &p) {
return qIsNaN(p.x()) || qIsNaN(p.y());
}
-#endif
class KoPathPoint::Private
{
diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
index b3d1d22..f8afab3 100644
--- a/libs/flake/KoPathShape.cpp
+++ b/libs/flake/KoPathShape.cpp
@@ -51,12 +51,10 @@
#include <kdebug.h>
#include <QPainter>
-#ifndef QT_NO_DEBUG
#include <qnumeric.h> // for qIsNaN
static bool qIsNaNPoint(const QPointF &p) {
return qIsNaN(p.x()) || qIsNaN(p.y());
}
-#endif
static const qreal DefaultMarkerWidth = 3.0;
diff --git a/libs/widgetutils/KoProperties.cpp
b/libs/widgetutils/KoProperties.cpp
index 24e0219..ee89001 100644
--- a/libs/widgetutils/KoProperties.cpp
+++ b/libs/widgetutils/KoProperties.cpp
@@ -21,6 +21,7 @@
#include "KoProperties.h"
#include <QDomDocument>
+#include <QDataStream>
class KoProperties::Private
{
--
2.4.1
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
