From fc811a6f2be27ad13c76bcc14984d12d4708e4b6 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@digia.com>
Date: Fri, 4 Jan 2013 14:11:05 +0100
Subject: [PATCH] Added relative macros in headers and sources

Including QT_BEGIN_NAMESPACE, QT_END_NAMESPACE, QT_BEGIN_HEADER
and QT_END_HEADER.

Change-Id: I9040bdf097d229ba897ada799f72cd9bfc80c844
Reviewed-by: Liang Qi <liang.qi@digia.com>
---
 src/qtdesktop/qdesktopitem.cpp            | 4 ++++
 src/qtdesktop/qdesktopitem_p.h            | 8 ++++++++
 src/qtdesktop/qfiledialogitem.cpp         | 4 ++++
 src/qtdesktop/qfiledialogitem_p.h         | 8 ++++++++
 src/qtdesktop/qquickcomponentsprivate.cpp | 3 +++
 src/qtdesktop/qquickcomponentsprivate_p.h | 8 ++++++++
 src/qtdesktop/qquicklayout.cpp            | 4 ++++
 src/qtdesktop/qquicklayout_p.h            | 8 ++++++++
 src/qtdesktop/qquicklayoutengine.cpp      | 3 +++
 src/qtdesktop/qquicklayoutengine_p.h      | 8 ++++++++
 src/qtdesktop/qquicklinearlayout.cpp      | 4 ++++
 src/qtdesktop/qquicklinearlayout_p.h      | 7 +++++++
 src/qtdesktop/qrangemodel.cpp             | 4 ++++
 src/qtdesktop/qrangemodel_p.h             | 8 ++++++++
 src/qtdesktop/qrangemodel_p_p.h           | 8 ++++++++
 src/qtdesktop/qstyleitem.cpp              | 4 ++++
 src/qtdesktop/qstyleitem_p.h              | 8 ++++++++
 src/qtdesktop/qstyleplugin.cpp            | 4 ++++
 src/qtdesktop/qstyleplugin_p.h            | 8 ++++++++
 src/qtdesktop/qtmenu.cpp                  | 4 ++++
 src/qtdesktop/qtmenu_p.h                  | 8 ++++++++
 src/qtdesktop/qtmenubar.cpp               | 4 ++++
 src/qtdesktop/qtmenubar_p.h               | 8 ++++++++
 src/qtdesktop/qtmenuitem.cpp              | 4 ++++
 src/qtdesktop/qtmenuitem_p.h              | 8 ++++++++
 src/qtdesktop/qtsplitterbase.cpp          | 4 ++++
 src/qtdesktop/qtsplitterbase_p.h          | 7 +++++++
 src/qtdesktop/qwheelarea.cpp              | 4 ++++
 src/qtdesktop/qwheelarea_p.h              | 6 ++++++
 29 files changed, 170 insertions(+)

diff --git a/src/qtdesktop/qdesktopitem.cpp b/src/qtdesktop/qdesktopitem.cpp
index 1d38d4bc7..654334552 100644
--- a/src/qtdesktop/qdesktopitem.cpp
+++ b/src/qtdesktop/qdesktopitem.cpp
@@ -40,6 +40,8 @@
 
 #include "qdesktopitem_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QDesktopItem::QDesktopItem(QObject* obj) : QObject(obj) {
     connect(&desktopWidget, SIGNAL(resized(int)), this, SIGNAL(screenGeometryChanged()));
     connect(&desktopWidget, SIGNAL(resized(int)), this, SIGNAL(availableGeometryChanged()));
@@ -83,3 +85,5 @@ int QDesktopItem::availableHeight() const
 QDesktopItem *QDesktopItem::qmlAttachedProperties(QObject *obj) {
     return new QDesktopItem(obj);
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qdesktopitem_p.h b/src/qtdesktop/qdesktopitem_p.h
index 6639b8ee5..920cf1989 100644
--- a/src/qtdesktop/qdesktopitem_p.h
+++ b/src/qtdesktop/qdesktopitem_p.h
@@ -44,6 +44,10 @@
 #include <QtWidgets/QDesktopWidget>
 #include <QtQml>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QDesktopItem : public QObject
 {
     Q_OBJECT
@@ -75,6 +79,10 @@ Q_SIGNALS:
     void screenCountChanged();
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPEINFO(QDesktopItem, QML_HAS_ATTACHED_PROPERTIES)
 
+QT_END_HEADER
+
 #endif // QDesktopItemITEM_H
diff --git a/src/qtdesktop/qfiledialogitem.cpp b/src/qtdesktop/qfiledialogitem.cpp
index 75359c7e5..67c7cb4b0 100644
--- a/src/qtdesktop/qfiledialogitem.cpp
+++ b/src/qtdesktop/qfiledialogitem.cpp
@@ -77,6 +77,8 @@
 #include <QGraphicsScene>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QFileDialogItem::QFileDialogItem():
     _dialog(new QFileDialog),
     _isOpen(false),
@@ -322,3 +324,5 @@ QVariant QFileDialogItem::itemChange(GraphicsItemChange change,
     return QDeclarativeItem::itemChange(change, value);
 }
 #endif
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qfiledialogitem_p.h b/src/qtdesktop/qfiledialogitem_p.h
index 1870a3a9c..ab06ccbaf 100644
--- a/src/qtdesktop/qfiledialogitem_p.h
+++ b/src/qtdesktop/qfiledialogitem_p.h
@@ -51,6 +51,10 @@
 #endif
 #include <QFileDialog>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 #if QT_VERSION < 0x050000
 class QFileDialogItem : public QDeclarativeItem
 #else
@@ -129,4 +133,8 @@ private:
     bool _selectFolder;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QFILEDIALOGITEM_H
diff --git a/src/qtdesktop/qquickcomponentsprivate.cpp b/src/qtdesktop/qquickcomponentsprivate.cpp
index 9b8fd85d9..d53b29d87 100644
--- a/src/qtdesktop/qquickcomponentsprivate.cpp
+++ b/src/qtdesktop/qquickcomponentsprivate.cpp
@@ -42,6 +42,7 @@
 #include <QToolTip>
 #include <QQuickWindow>
 
+QT_BEGIN_NAMESPACE
 
 QQuickComponentsPrivate::QQuickComponentsPrivate(QObject *parent)
     : QObject(parent)
@@ -61,3 +62,5 @@ void QQuickComponentsPrivate::hideToolTip()
 {
     QToolTip::hideText();
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qquickcomponentsprivate_p.h b/src/qtdesktop/qquickcomponentsprivate_p.h
index 5a5fa7943..d98fdaa71 100644
--- a/src/qtdesktop/qquickcomponentsprivate_p.h
+++ b/src/qtdesktop/qquickcomponentsprivate_p.h
@@ -44,6 +44,10 @@
 #include <QObject>
 #include <QQuickItem>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QQuickComponentsPrivate : public QObject
 {
     Q_OBJECT
@@ -55,4 +59,8 @@ public:
     Q_INVOKABLE void hideToolTip();
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif
diff --git a/src/qtdesktop/qquicklayout.cpp b/src/qtdesktop/qquicklayout.cpp
index f787c0325..1872fc76c 100644
--- a/src/qtdesktop/qquicklayout.cpp
+++ b/src/qtdesktop/qquicklayout.cpp
@@ -43,6 +43,8 @@
 #include <QApplication>
 #include <QtCore/qnumeric.h>
 
+QT_BEGIN_NAMESPACE
+
 static const qreal q_declarativeLayoutMaxSize = 10e8;
 
 
@@ -193,3 +195,5 @@ void QQuickComponentsLayout::reconfigureLayout()
 {
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qquicklayout_p.h b/src/qtdesktop/qquicklayout_p.h
index 86f502661..4c83ad925 100644
--- a/src/qtdesktop/qquicklayout_p.h
+++ b/src/qtdesktop/qquicklayout_p.h
@@ -44,6 +44,10 @@
 #include <QPointer>
 #include <QQuickItem>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QQuickComponentsLayoutAttached;
 
 
@@ -123,7 +127,11 @@ private:
     friend class QQuickComponentsLayout;
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QQuickComponentsLayout)
 QML_DECLARE_TYPEINFO(QQuickComponentsLayout, QML_HAS_ATTACHED_PROPERTIES)
 
+QT_END_HEADER
+
 #endif
diff --git a/src/qtdesktop/qquicklayoutengine.cpp b/src/qtdesktop/qquicklayoutengine.cpp
index f11a21074..2ede7af9a 100644
--- a/src/qtdesktop/qquicklayoutengine.cpp
+++ b/src/qtdesktop/qquicklayoutengine.cpp
@@ -40,6 +40,7 @@
 
 #include "qquicklayoutengine_p.h"
 
+QT_BEGIN_NAMESPACE
 
 /*
   This function is a modification of qGeomCalc() included in "QtCore/kernel/qlayoutengine_p.h".
@@ -289,3 +290,5 @@ void qDeclarativeLayoutCalculate(QVector<QQuickComponentsLayoutInfo> &chain, int
         p += data->effectiveSpacer(spacer) + extra;
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qquicklayoutengine_p.h b/src/qtdesktop/qquicklayoutengine_p.h
index c4cdaf08b..225c5b9b3 100644
--- a/src/qtdesktop/qquicklayoutengine_p.h
+++ b/src/qtdesktop/qquicklayoutengine_p.h
@@ -43,6 +43,10 @@
 
 #include <QVector>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 struct QQuickComponentsLayoutInfo
 {
     QQuickComponentsLayoutInfo()
@@ -81,4 +85,8 @@ struct QQuickComponentsLayoutInfo
 void qDeclarativeLayoutCalculate(QVector<QQuickComponentsLayoutInfo> &chain, int start,
                                  int count, qreal pos, qreal space, qreal spacer);
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif
diff --git a/src/qtdesktop/qquicklinearlayout.cpp b/src/qtdesktop/qquicklinearlayout.cpp
index 642e2fc78..da18ae0b0 100644
--- a/src/qtdesktop/qquicklinearlayout.cpp
+++ b/src/qtdesktop/qquicklinearlayout.cpp
@@ -56,6 +56,8 @@
     \brief ColumnLayout is doing bla...bla...
 */
 
+QT_BEGIN_NAMESPACE
+
 static const qreal q_declarativeLayoutDefaultSpacing = 4.0;
 
 
@@ -256,3 +258,5 @@ void QQuickComponentsLinearLayout::reconfigureLayout()
         info->setMaximumHeight(totalMaximumSize + totalSpacing);
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qquicklinearlayout_p.h b/src/qtdesktop/qquicklinearlayout_p.h
index 2209ce62c..059d4485f 100644
--- a/src/qtdesktop/qquicklinearlayout_p.h
+++ b/src/qtdesktop/qquicklinearlayout_p.h
@@ -43,6 +43,9 @@
 
 #include "qquicklayout_p.h"
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QQuickComponentsLinearLayout : public QQuickComponentsLayout
 {
@@ -108,4 +111,8 @@ public:
         : QQuickComponentsLinearLayout(Vertical, parent) {}
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif
diff --git a/src/qtdesktop/qrangemodel.cpp b/src/qtdesktop/qrangemodel.cpp
index 4d07e81b0..1f454ddd0 100644
--- a/src/qtdesktop/qrangemodel.cpp
+++ b/src/qtdesktop/qrangemodel.cpp
@@ -67,6 +67,8 @@
 #include "qrangemodel_p.h"
 #include "qrangemodel_p_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QRangeModelPrivate::QRangeModelPrivate(QRangeModel *qq)
     : q_ptr(qq)
 {
@@ -532,3 +534,5 @@ void QRangeModel::toMaximum()
     Q_D(const QRangeModel);
     setValue(d->maximum);
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qrangemodel_p.h b/src/qtdesktop/qrangemodel_p.h
index 675967aef..6250614af 100644
--- a/src/qtdesktop/qrangemodel_p.h
+++ b/src/qtdesktop/qrangemodel_p.h
@@ -46,6 +46,10 @@
 #include <QtWidgets/qabstractslider.h>
 #include <QtQml/qqml.h>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QRangeModelPrivate;
 
 class QRangeModel : public QObject
@@ -120,6 +124,10 @@ private:
 
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QRangeModel)
 
+QT_END_HEADER
+
 #endif // QRANGEMODEL_H
diff --git a/src/qtdesktop/qrangemodel_p_p.h b/src/qtdesktop/qrangemodel_p_p.h
index 376d08959..d7b5c8f75 100644
--- a/src/qtdesktop/qrangemodel_p_p.h
+++ b/src/qtdesktop/qrangemodel_p_p.h
@@ -52,6 +52,10 @@
 // We mean it.
 //
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 #include "qrangemodel_p.h"
 
 class QRangeModelPrivate
@@ -103,4 +107,8 @@ public:
     void emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition);
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QRANGEMODEL_P_H
diff --git a/src/qtdesktop/qstyleitem.cpp b/src/qtdesktop/qstyleitem.cpp
index 43fade929..58766d624 100644
--- a/src/qtdesktop/qstyleitem.cpp
+++ b/src/qtdesktop/qstyleitem.cpp
@@ -51,6 +51,8 @@
 #include <QtWidgets/QtWidgets>
 #include <QtCore/QStringBuilder>
 
+QT_BEGIN_NAMESPACE
+
 #ifdef Q_OS_MAC
 #include <Carbon/Carbon.h>
 
@@ -1076,3 +1078,5 @@ bool QStyleItem::hasThemeIcon(const QString &icon) const
 {
     return QIcon::hasThemeIcon(icon);
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qstyleitem_p.h b/src/qtdesktop/qstyleitem_p.h
index 6b274060e..4e12453f0 100644
--- a/src/qtdesktop/qstyleitem_p.h
+++ b/src/qtdesktop/qstyleitem_p.h
@@ -45,6 +45,10 @@
 #include <QtWidgets/QStyle>
 #include <QEvent>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QStyleItem: public QQuickPaintedItem
 {
     Q_OBJECT
@@ -251,4 +255,8 @@ protected:
 
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif //STYLEWRAPPER_H
diff --git a/src/qtdesktop/qstyleplugin.cpp b/src/qtdesktop/qstyleplugin.cpp
index 384ed62cf..be265d9bf 100644
--- a/src/qtdesktop/qstyleplugin.cpp
+++ b/src/qtdesktop/qstyleplugin.cpp
@@ -58,6 +58,8 @@
 #include <QtQuick/QQuickWindow>
 #include <QImage>
 
+QT_BEGIN_NAMESPACE
+
 // Load icons from desktop theme
 class DesktopIconProvider : public QQuickImageProvider
 {
@@ -124,3 +126,5 @@ void StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
     Q_UNUSED(uri);
     engine->addImageProvider("desktoptheme", new DesktopIconProvider);
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qstyleplugin_p.h b/src/qtdesktop/qstyleplugin_p.h
index 2bdb2a819..10e52985a 100644
--- a/src/qtdesktop/qstyleplugin_p.h
+++ b/src/qtdesktop/qstyleplugin_p.h
@@ -45,6 +45,10 @@
 #include <QtCore/QTimer>
 #include <QtWidgets/QFileSystemModel>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class StylePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -54,4 +58,8 @@ public:
     void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // STYLEPLUGIN_H
diff --git a/src/qtdesktop/qtmenu.cpp b/src/qtdesktop/qtmenu.cpp
index 94ee5d14d..e02d28a9f 100644
--- a/src/qtdesktop/qtmenu.cpp
+++ b/src/qtdesktop/qtmenu.cpp
@@ -51,6 +51,8 @@
     \brief Menu is doing bla...bla...
 */
 
+QT_BEGIN_NAMESPACE
+
 QtMenu::QtMenu(QQuickItem *parent)
     : QtMenuBase(parent),
       dummy(0),
@@ -239,3 +241,5 @@ void QtMenu::setModel(const QVariant &newModel) {
         emit modelChanged(m_model);
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qtmenu_p.h b/src/qtdesktop/qtmenu_p.h
index cc4bc87ea..52b7cb840 100644
--- a/src/qtdesktop/qtmenu_p.h
+++ b/src/qtdesktop/qtmenu_p.h
@@ -48,6 +48,10 @@
 #include <QtCore/QVariant>
 #include "qtmenuitem_p.h"
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QtMenu : public QtMenuBase
 {
     Q_OBJECT
@@ -116,6 +120,10 @@ private:
     QVariant m_model;
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QtMenu)
 
+QT_END_HEADER
+
 #endif // QTMLMENU_H
diff --git a/src/qtdesktop/qtmenubar.cpp b/src/qtdesktop/qtmenubar.cpp
index bab24c8e1..a48b6e3a1 100644
--- a/src/qtdesktop/qtmenubar.cpp
+++ b/src/qtdesktop/qtmenubar.cpp
@@ -50,6 +50,8 @@
     \brief MenuBar is doing bla...bla...
 */
 
+QT_BEGIN_NAMESPACE
+
 QtMenuBar::QtMenuBar(QQuickItem *parent)
     : QQuickItem(parent)
 {
@@ -98,3 +100,5 @@ void QtMenuBar::append_menu(QQmlListProperty<QtMenu> *list, QtMenu *menu)
         menuBar->menuChanged();
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qtmenubar_p.h b/src/qtdesktop/qtmenubar_p.h
index b10902877..66ea01447 100644
--- a/src/qtdesktop/qtmenubar_p.h
+++ b/src/qtdesktop/qtmenubar_p.h
@@ -48,6 +48,10 @@
 
 #include "qtmenu_p.h"
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QtMenuBar: public QQuickItem
 {
     Q_OBJECT
@@ -85,4 +89,8 @@ private:
     QMenuBar *_menuBar;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif //QTMENUBAR_H
diff --git a/src/qtdesktop/qtmenuitem.cpp b/src/qtdesktop/qtmenuitem.cpp
index 8e4d82cd0..ec1826b03 100644
--- a/src/qtdesktop/qtmenuitem.cpp
+++ b/src/qtdesktop/qtmenuitem.cpp
@@ -40,6 +40,8 @@
 
 #include "qtmenuitem_p.h"
 
+QT_BEGIN_NAMESPACE
+
 void QtMenuBase::setIconSource(const QUrl &icon)
 {
     _iconSource = icon;
@@ -166,3 +168,5 @@ QAction * QtMenuItem::action()
 {
     return _action;
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qtmenuitem_p.h b/src/qtdesktop/qtmenuitem_p.h
index 5ee11671a..44323ea25 100644
--- a/src/qtdesktop/qtmenuitem_p.h
+++ b/src/qtdesktop/qtmenuitem_p.h
@@ -47,6 +47,10 @@
 
 #include <QtQuick/QQuickItem>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QtMenuBase: public QQuickItem
 {
 Q_OBJECT
@@ -123,4 +127,8 @@ private:
     QAction *_action;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif //QTMENUITEM_H
diff --git a/src/qtdesktop/qtsplitterbase.cpp b/src/qtdesktop/qtsplitterbase.cpp
index 72be3e401..1ba2a58ab 100644
--- a/src/qtdesktop/qtsplitterbase.cpp
+++ b/src/qtdesktop/qtsplitterbase.cpp
@@ -47,6 +47,8 @@
     \brief Splitter is doing bla...bla...
 */
 
+QT_BEGIN_NAMESPACE
+
 QtSplitterBase::QtSplitterBase(QQuickItem *parent)
     : QQuickItem(parent)
 {
@@ -98,3 +100,5 @@ QtSplitterAttached::QtSplitterAttached(QObject *object)
       m_expanding(false)
 {
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qtsplitterbase_p.h b/src/qtdesktop/qtsplitterbase_p.h
index 8bf4ee4d5..31df89eed 100644
--- a/src/qtdesktop/qtsplitterbase_p.h
+++ b/src/qtdesktop/qtsplitterbase_p.h
@@ -44,6 +44,9 @@
 #include <QtQml>
 #include <QtQuick>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QtSplitterAttached : public QObject
 {
@@ -118,6 +121,10 @@ public:
     static QtSplitterAttached *qmlAttachedProperties(QObject *object);
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPEINFO(QtSplitterBase, QML_HAS_ATTACHED_PROPERTIES)
 
+QT_END_HEADER
+
 #endif // QTSPLITTERBASE_H
diff --git a/src/qtdesktop/qwheelarea.cpp b/src/qtdesktop/qwheelarea.cpp
index 3bf8016ca..251353cb8 100644
--- a/src/qtdesktop/qwheelarea.cpp
+++ b/src/qtdesktop/qwheelarea.cpp
@@ -47,6 +47,8 @@
     \brief WheelArea is doing bla...bla...
 */
 
+QT_BEGIN_NAMESPACE
+
 QWheelArea::QWheelArea(QQuickItem *parent)
     : QQuickItem(parent),
       m_horizontalMinimumValue(0),
@@ -185,3 +187,5 @@ qreal QWheelArea::scrollSpeed() const
 {
     return m_scrollSpeed;
 }
+
+QT_END_NAMESPACE
diff --git a/src/qtdesktop/qwheelarea_p.h b/src/qtdesktop/qwheelarea_p.h
index a112607cb..503791036 100644
--- a/src/qtdesktop/qwheelarea_p.h
+++ b/src/qtdesktop/qwheelarea_p.h
@@ -45,6 +45,9 @@
 #include <QtWidgets/qgraphicssceneevent.h>
 #include <QtQuick/qquickitem.h>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QWheelArea : public QQuickItem
 {
@@ -113,7 +116,10 @@ private:
     Q_DISABLE_COPY(QWheelArea)
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QWheelArea)
 
+QT_END_HEADER
 
 #endif // QWHEELAREA_H
-- 
GitLab