From 3e37a93c2e632d3a13b49339650303d8c25fa378 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 20 Jun 2019 09:09:56 +0200 Subject: [PATCH] QmlDesigner: Fix compile with namespaced Qt Broke with 376c6b9d59c. Change-Id: If98cb76aa5c68c7c2ada5578ab58c37956617c19 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/curveeditor/curveeditormodel.h | 2 ++ .../components/curveeditor/detail/curveeditorstyledialog.h | 2 ++ .../qmldesigner/components/curveeditor/detail/curvesegment.h | 2 ++ .../qmldesigner/components/curveeditor/detail/playhead.h | 2 ++ src/plugins/qmldesigner/components/curveeditor/detail/utils.h | 2 ++ src/plugins/qmldesigner/components/curveeditor/treeitem.h | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h index 840107ced5d..6e212d4c6af 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.h @@ -29,7 +29,9 @@ #include +QT_BEGIN_NAMESPACE class QPointF; +QT_END_NAMESPACE namespace DesignTools { diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h index ad5a28e2e13..f1dc3bc3728 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveeditorstyledialog.h @@ -28,9 +28,11 @@ #include +QT_BEGIN_NAMESPACE class QPushButton; class QSpinBox; class QDoubleSpinBox; +QT_END_NAMESPACE namespace DesignTools { diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curvesegment.h b/src/plugins/qmldesigner/components/curveeditor/detail/curvesegment.h index ce2d700f891..5dbce58bccd 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curvesegment.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curvesegment.h @@ -29,7 +29,9 @@ #include +QT_BEGIN_NAMESPACE class QPointF; +QT_END_NAMESPACE namespace DesignTools { diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h index ffb4da4cfdc..28d2a21a5c3 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.h @@ -28,7 +28,9 @@ #include #include +QT_BEGIN_NAMESPACE class QPainter; +QT_END_NAMESPACE namespace DesignTools { diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/utils.h b/src/plugins/qmldesigner/components/curveeditor/detail/utils.h index 812c5d083ac..77cbd2c7bf2 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/utils.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/utils.h @@ -25,11 +25,13 @@ #pragma once +QT_BEGIN_NAMESPACE class QColor; class QPalette; class QPointF; class QRectF; class QTransform; +QT_END_NAMESPACE namespace DesignTools { diff --git a/src/plugins/qmldesigner/components/curveeditor/treeitem.h b/src/plugins/qmldesigner/components/curveeditor/treeitem.h index e5004834b8e..5b31dc2fc8c 100644 --- a/src/plugins/qmldesigner/components/curveeditor/treeitem.h +++ b/src/plugins/qmldesigner/components/curveeditor/treeitem.h @@ -33,8 +33,10 @@ #include +QT_BEGIN_NAMESPACE class QIcon; class QVariant; +QT_END_NAMESPACE namespace DesignTools {