Moved all header files to _p.h

Change-Id: I58c6f143de8d074fe2b382eff524500c6a8270ea
Reviewed-by: Liang Qi <liang.qi@digia.com>

29 files changed, 215 insertions, 215 deletions

diff --git a/src/qtdesktop/qdesktopitem.cpp b/src/qtdesktop/qdesktopitem.cpp
index 15c260af..1d38d4bc 100644
--- a/src/qtdesktop/qdesktopitem.cpp
+++ b/src/qtdesktop/qdesktopitem.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qdesktopitem.h"
+#include "qdesktopitem_p.h"
 
 QDesktopItem::QDesktopItem(QObject* obj) : QObject(obj) {
     connect(&desktopWidget, SIGNAL(resized(int)), this, SIGNAL(screenGeometryChanged()));
diff --git a/src/qtdesktop/qdesktopitem.h b/src/qtdesktop/qdesktopitem_p.h
index 6639b8ee..6639b8ee 100644
--- a/src/qtdesktop/qdesktopitem.h
+++ b/src/qtdesktop/qdesktopitem_p.h
diff --git a/src/qtdesktop/qfiledialogitem.cpp b/src/qtdesktop/qfiledialogitem.cpp
index 91f83c93..75359c7e 100644
--- a/src/qtdesktop/qfiledialogitem.cpp
+++ b/src/qtdesktop/qfiledialogitem.cpp
@@ -71,7 +71,7 @@
     either by closing the dialog window or by pressing the Cancel button.
 */
 
-#include "qfiledialogitem.h"
+#include "qfiledialogitem_p.h"
 
 #if QT_VERSION < 0x050000
 #include <QGraphicsScene>
diff --git a/src/qtdesktop/qfiledialogitem.h b/src/qtdesktop/qfiledialogitem_p.h
index 1870a3a9..1870a3a9 100644
--- a/src/qtdesktop/qfiledialogitem.h
+++ b/src/qtdesktop/qfiledialogitem_p.h
diff --git a/src/qtdesktop/qquickcomponentsprivate.cpp b/src/qtdesktop/qquickcomponentsprivate.cpp
index 54b41b4c..9b8fd85d 100644
--- a/src/qtdesktop/qquickcomponentsprivate.cpp
+++ b/src/qtdesktop/qquickcomponentsprivate.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qquickcomponentsprivate.h"
+#include "qquickcomponentsprivate_p.h"
 #include <QToolTip>
 #include <QQuickWindow>
 
diff --git a/src/qtdesktop/qquickcomponentsprivate.h b/src/qtdesktop/qquickcomponentsprivate_p.h
index 5a5fa794..5a5fa794 100644
--- a/src/qtdesktop/qquickcomponentsprivate.h
+++ b/src/qtdesktop/qquickcomponentsprivate_p.h
diff --git a/src/qtdesktop/qquicklayout.cpp b/src/qtdesktop/qquicklayout.cpp
index 3c081446..f787c032 100644
--- a/src/qtdesktop/qquicklayout.cpp
+++ b/src/qtdesktop/qquicklayout.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qquicklayout.h"
+#include "qquicklayout_p.h"
 #include <QEvent>
 #include <QApplication>
 #include <QtCore/qnumeric.h>
diff --git a/src/qtdesktop/qquicklayout.h b/src/qtdesktop/qquicklayout_p.h
index 86f50266..86f50266 100644
--- a/src/qtdesktop/qquicklayout.h
+++ b/src/qtdesktop/qquicklayout_p.h
diff --git a/src/qtdesktop/qquicklinearlayout.cpp b/src/qtdesktop/qquicklinearlayout.cpp
index 9931f4ee..642e2fc7 100644
--- a/src/qtdesktop/qquicklinearlayout.cpp
+++ b/src/qtdesktop/qquicklinearlayout.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qquicklinearlayout.h"
+#include "qquicklinearlayout_p.h"
 #include "qquicklayoutengine_p.h"
 #include <QtCore/qnumeric.h>
 
diff --git a/src/qtdesktop/qquicklinearlayout.h b/src/qtdesktop/qquicklinearlayout_p.h
index 8cd73e86..2209ce62 100644
--- a/src/qtdesktop/qquicklinearlayout.h
+++ b/src/qtdesktop/qquicklinearlayout_p.h
@@ -41,7 +41,7 @@
 #ifndef QDECLARATIVELINEARLAYOUT_H
 #define QDECLARATIVELINEARLAYOUT_H
 
-#include "qquicklayout.h"
+#include "qquicklayout_p.h"
 
 
 class QQuickComponentsLinearLayout : public QQuickComponentsLayout
diff --git a/src/qtdesktop/qrangemodel.cpp b/src/qtdesktop/qrangemodel.cpp
index d4c2d2e8..4d07e81b 100644
--- a/src/qtdesktop/qrangemodel.cpp
+++ b/src/qtdesktop/qrangemodel.cpp
@@ -64,8 +64,8 @@
 #include <QAccessible>
 #endif
 
-#include "qrangemodel.h"
 #include "qrangemodel_p.h"
+#include "qrangemodel_p_p.h"
 
 QRangeModelPrivate::QRangeModelPrivate(QRangeModel *qq)
     : q_ptr(qq)
diff --git a/src/qtdesktop/qrangemodel.h b/src/qtdesktop/qrangemodel.h
deleted file mode 100644
index 675967ae..00000000
--- a/src/qtdesktop/qrangemodel.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Components project.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QRANGEMODEL_H
-#define QRANGEMODEL_H
-
-#include <QtCore/qobject.h>
-//#include <QtGui/qgraphicsitem.h>
-#include <QtWidgets/qabstractslider.h>
-#include <QtQml/qqml.h>
-
-class QRangeModelPrivate;
-
-class QRangeModel : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true)
-    Q_PROPERTY(qreal minimumValue READ minimum WRITE setMinimum NOTIFY minimumChanged)
-    Q_PROPERTY(qreal maximumValue READ maximum WRITE setMaximum NOTIFY maximumChanged)
-    Q_PROPERTY(qreal stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged)
-    Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged)
-    Q_PROPERTY(qreal positionAtMinimum READ positionAtMinimum WRITE setPositionAtMinimum NOTIFY positionAtMinimumChanged)
-    Q_PROPERTY(qreal positionAtMaximum READ positionAtMaximum WRITE setPositionAtMaximum NOTIFY positionAtMaximumChanged)
-    Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged)
-
-public:
-    QRangeModel(QObject *parent = 0);
-    virtual ~QRangeModel();
-
-    void setRange(qreal min, qreal max);
-    void setPositionRange(qreal min, qreal max);
-
-    void setStepSize(qreal stepSize);
-    qreal stepSize() const;
-
-    void setMinimum(qreal min);
-    qreal minimum() const;
-
-    void setMaximum(qreal max);
-    qreal maximum() const;
-
-    void setPositionAtMinimum(qreal posAtMin);
-    qreal positionAtMinimum() const;
-
-    void setPositionAtMaximum(qreal posAtMax);
-    qreal positionAtMaximum() const;
-
-    void setInverted(bool inverted);
-    bool inverted() const;
-
-    qreal value() const;
-    qreal position() const;
-
-    Q_INVOKABLE qreal valueForPosition(qreal position) const;
-    Q_INVOKABLE qreal positionForValue(qreal value) const;
-
-public Q_SLOTS:
-    void toMinimum();
-    void toMaximum();
-    void setValue(qreal value);
-    void setPosition(qreal position);
-
-Q_SIGNALS:
-    void valueChanged(qreal value);
-    void positionChanged(qreal position);
-
-    void stepSizeChanged(qreal stepSize);
-
-    void invertedChanged(bool inverted);
-
-    void minimumChanged(qreal min);
-    void maximumChanged(qreal max);
-    void positionAtMinimumChanged(qreal min);
-    void positionAtMaximumChanged(qreal max);
-
-protected:
-    QRangeModel(QRangeModelPrivate &dd, QObject *parent);
-    QRangeModelPrivate* d_ptr;
-
-private:
-    Q_DISABLE_COPY(QRangeModel)
-    Q_DECLARE_PRIVATE(QRangeModel)
-
-};
-
-QML_DECLARE_TYPE(QRangeModel)
-
-#endif // QRANGEMODEL_H
diff --git a/src/qtdesktop/qrangemodel_p.h b/src/qtdesktop/qrangemodel_p.h
index 83b28949..675967ae 100644
--- a/src/qtdesktop/qrangemodel_p.h
+++ b/src/qtdesktop/qrangemodel_p.h
@@ -38,69 +38,88 @@
 **
 ****************************************************************************/
 
-#ifndef QRANGEMODEL_P_H
-#define QRANGEMODEL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt Components API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qrangemodel.h"
-
-class QRangeModelPrivate
+#ifndef QRANGEMODEL_H
+#define QRANGEMODEL_H
+
+#include <QtCore/qobject.h>
+//#include <QtGui/qgraphicsitem.h>
+#include <QtWidgets/qabstractslider.h>
+#include <QtQml/qqml.h>
+
+class QRangeModelPrivate;
+
+class QRangeModel : public QObject
 {
-    Q_DECLARE_PUBLIC(QRangeModel)
+    Q_OBJECT
+    Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true)
+    Q_PROPERTY(qreal minimumValue READ minimum WRITE setMinimum NOTIFY minimumChanged)
+    Q_PROPERTY(qreal maximumValue READ maximum WRITE setMaximum NOTIFY maximumChanged)
+    Q_PROPERTY(qreal stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged)
+    Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged)
+    Q_PROPERTY(qreal positionAtMinimum READ positionAtMinimum WRITE setPositionAtMinimum NOTIFY positionAtMinimumChanged)
+    Q_PROPERTY(qreal positionAtMaximum READ positionAtMaximum WRITE setPositionAtMaximum NOTIFY positionAtMaximumChanged)
+    Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged)
+
 public:
-    QRangeModelPrivate(QRangeModel *qq);
-    virtual ~QRangeModelPrivate();
+    QRangeModel(QObject *parent = 0);
+    virtual ~QRangeModel();
+
+    void setRange(qreal min, qreal max);
+    void setPositionRange(qreal min, qreal max);
+
+    void setStepSize(qreal stepSize);
+    qreal stepSize() const;
 
-    void init();
+    void setMinimum(qreal min);
+    qreal minimum() const;
 
-    qreal posatmin, posatmax;
-    qreal minimum, maximum, stepSize, pos, value;
+    void setMaximum(qreal max);
+    qreal maximum() const;
 
-    uint inverted : 1;
+    void setPositionAtMinimum(qreal posAtMin);
+    qreal positionAtMinimum() const;
 
-    QRangeModel *q_ptr;
+    void setPositionAtMaximum(qreal posAtMax);
+    qreal positionAtMaximum() const;
 
-    inline qreal effectivePosAtMin() const {
-        return inverted ? posatmax : posatmin;
-    }
+    void setInverted(bool inverted);
+    bool inverted() const;
 
-    inline qreal effectivePosAtMax() const {
-        return inverted ? posatmin : posatmax;
-    }
+    qreal value() const;
+    qreal position() const;
 
-    inline qreal equivalentPosition(qreal value) const {
-        // Return absolute position from absolute value
-        const qreal valueRange = maximum - minimum;
-        if (valueRange == 0)
-            return effectivePosAtMin();
+    Q_INVOKABLE qreal valueForPosition(qreal position) const;
+    Q_INVOKABLE qreal positionForValue(qreal value) const;
 
-        const qreal scale = (effectivePosAtMax() - effectivePosAtMin()) / valueRange;
-        return (value - minimum) * scale + effectivePosAtMin();
-    }
+public Q_SLOTS:
+    void toMinimum();
+    void toMaximum();
+    void setValue(qreal value);
+    void setPosition(qreal position);
 
-    inline qreal equivalentValue(qreal pos) const {
-        // Return absolute value from absolute position
-        const qreal posRange = effectivePosAtMax() - effectivePosAtMin();
-        if (posRange == 0)
-            return minimum;
+Q_SIGNALS:
+    void valueChanged(qreal value);
+    void positionChanged(qreal position);
 
-        const qreal scale = (maximum - minimum) / posRange;
-        return (pos - effectivePosAtMin()) * scale + minimum;
-    }
+    void stepSizeChanged(qreal stepSize);
+
+    void invertedChanged(bool inverted);
+
+    void minimumChanged(qreal min);
+    void maximumChanged(qreal max);
+    void positionAtMinimumChanged(qreal min);
+    void positionAtMaximumChanged(qreal max);
+
+protected:
+    QRangeModel(QRangeModelPrivate &dd, QObject *parent);
+    QRangeModelPrivate* d_ptr;
+
+private:
+    Q_DISABLE_COPY(QRangeModel)
+    Q_DECLARE_PRIVATE(QRangeModel)
 
-    qreal publicPosition(qreal position) const;
-    qreal publicValue(qreal value) const;
-    void emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition);
 };
 
-#endif // QRANGEMODEL_P_H
+QML_DECLARE_TYPE(QRangeModel)
+
+#endif // QRANGEMODEL_H
diff --git a/src/qtdesktop/qrangemodel_p_p.h b/src/qtdesktop/qrangemodel_p_p.h
new file mode 100644
index 00000000..376d0895
--- /dev/null
+++ b/src/qtdesktop/qrangemodel_p_p.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Components project.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRANGEMODEL_P_H
+#define QRANGEMODEL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt Components API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrangemodel_p.h"
+
+class QRangeModelPrivate
+{
+    Q_DECLARE_PUBLIC(QRangeModel)
+public:
+    QRangeModelPrivate(QRangeModel *qq);
+    virtual ~QRangeModelPrivate();
+
+    void init();
+
+    qreal posatmin, posatmax;
+    qreal minimum, maximum, stepSize, pos, value;
+
+    uint inverted : 1;
+
+    QRangeModel *q_ptr;
+
+    inline qreal effectivePosAtMin() const {
+        return inverted ? posatmax : posatmin;
+    }
+
+    inline qreal effectivePosAtMax() const {
+        return inverted ? posatmin : posatmax;
+    }
+
+    inline qreal equivalentPosition(qreal value) const {
+        // Return absolute position from absolute value
+        const qreal valueRange = maximum - minimum;
+        if (valueRange == 0)
+            return effectivePosAtMin();
+
+        const qreal scale = (effectivePosAtMax() - effectivePosAtMin()) / valueRange;
+        return (value - minimum) * scale + effectivePosAtMin();
+    }
+
+    inline qreal equivalentValue(qreal pos) const {
+        // Return absolute value from absolute position
+        const qreal posRange = effectivePosAtMax() - effectivePosAtMin();
+        if (posRange == 0)
+            return minimum;
+
+        const qreal scale = (maximum - minimum) / posRange;
+        return (pos - effectivePosAtMin()) * scale + minimum;
+    }
+
+    qreal publicPosition(qreal position) const;
+    qreal publicValue(qreal value) const;
+    void emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition);
+};
+
+#endif // QRANGEMODEL_P_H
diff --git a/src/qtdesktop/qstyleitem.cpp b/src/qtdesktop/qstyleitem.cpp
index 462f2759..43fade92 100644
--- a/src/qtdesktop/qstyleitem.cpp
+++ b/src/qtdesktop/qstyleitem.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qstyleitem.h"
+#include "qstyleitem_p.h"
 
 #include <QtGui/QPainter>
 #include <QtWidgets/QStyle>
diff --git a/src/qtdesktop/qstyleitem.h b/src/qtdesktop/qstyleitem_p.h
index 6b274060..6b274060 100644
--- a/src/qtdesktop/qstyleitem.h
+++ b/src/qtdesktop/qstyleitem_p.h
diff --git a/src/qtdesktop/qstyleplugin.cpp b/src/qtdesktop/qstyleplugin.cpp
index 500d4ee6..384ed62c 100644
--- a/src/qtdesktop/qstyleplugin.cpp
+++ b/src/qtdesktop/qstyleplugin.cpp
@@ -39,17 +39,17 @@
 ****************************************************************************/
 
 #include <qqml.h>
-#include "qstyleplugin.h"
-#include "qstyleitem.h"
-#include "qrangemodel.h"
-#include "qtmenu.h"
-#include "qtmenubar.h"
-#include "qdesktopitem.h"
-#include "qwheelarea.h"
-#include "qtsplitterbase.h"
-#include "qquicklinearlayout.h"
-#include "qquickcomponentsprivate.h"
-#include "qfiledialogitem.h"
+#include "qstyleplugin_p.h"
+#include "qstyleitem_p.h"
+#include "qrangemodel_p.h"
+#include "qtmenu_p.h"
+#include "qtmenubar_p.h"
+#include "qdesktopitem_p.h"
+#include "qwheelarea_p.h"
+#include "qtsplitterbase_p.h"
+#include "qquicklinearlayout_p.h"
+#include "qquickcomponentsprivate_p.h"
+#include "qfiledialogitem_p.h"
 #include <qqmlextensionplugin.h>
 
 #include <qqmlengine.h>
diff --git a/src/qtdesktop/qstyleplugin.h b/src/qtdesktop/qstyleplugin_p.h
index 2bdb2a81..2bdb2a81 100644
--- a/src/qtdesktop/qstyleplugin.h
+++ b/src/qtdesktop/qstyleplugin_p.h
diff --git a/src/qtdesktop/qtmenu.cpp b/src/qtdesktop/qtmenu.cpp
index e6859df7..94ee5d14 100644
--- a/src/qtdesktop/qtmenu.cpp
+++ b/src/qtdesktop/qtmenu.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qtmenu.h"
+#include "qtmenu_p.h"
 #include "qdebug.h"
 #include <qapplication.h>
 #include <qmenubar.h>
diff --git a/src/qtdesktop/qtmenu.h b/src/qtdesktop/qtmenu_p.h
index d718b55b..cc4bc87e 100644
--- a/src/qtdesktop/qtmenu.h
+++ b/src/qtdesktop/qtmenu_p.h
@@ -46,7 +46,7 @@
 #include <QtQml/QtQml>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVariant>
-#include "qtmenuitem.h"
+#include "qtmenuitem_p.h"
 
 class QtMenu : public QtMenuBase
 {
diff --git a/src/qtdesktop/qtmenubar.cpp b/src/qtdesktop/qtmenubar.cpp
index 76f31bc1..bab24c8e 100644
--- a/src/qtdesktop/qtmenubar.cpp
+++ b/src/qtdesktop/qtmenubar.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qtmenubar.h"
+#include "qtmenubar_p.h"
 
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMenuBar>
diff --git a/src/qtdesktop/qtmenubar.h b/src/qtdesktop/qtmenubar_p.h
index 6f762bb7..b1090287 100644
--- a/src/qtdesktop/qtmenubar.h
+++ b/src/qtdesktop/qtmenubar_p.h
@@ -46,7 +46,7 @@
 #include <QtQuick/QQuickItem>
 #include <QtWidgets>
 
-#include "qtmenu.h"
+#include "qtmenu_p.h"
 
 class QtMenuBar: public QQuickItem
 {
diff --git a/src/qtdesktop/qtmenuitem.cpp b/src/qtdesktop/qtmenuitem.cpp
index d814157e..8e4d82cd 100644
--- a/src/qtdesktop/qtmenuitem.cpp
+++ b/src/qtdesktop/qtmenuitem.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qtmenuitem.h"
+#include "qtmenuitem_p.h"
 
 void QtMenuBase::setIconSource(const QUrl &icon)
 {
diff --git a/src/qtdesktop/qtmenuitem.h b/src/qtdesktop/qtmenuitem_p.h
index 5ee11671..5ee11671 100644
--- a/src/qtdesktop/qtmenuitem.h
+++ b/src/qtdesktop/qtmenuitem_p.h
diff --git a/src/qtdesktop/qtsplitterbase.cpp b/src/qtdesktop/qtsplitterbase.cpp
index 2b3a7b26..72be3e40 100644
--- a/src/qtdesktop/qtsplitterbase.cpp
+++ b/src/qtdesktop/qtsplitterbase.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qtsplitterbase.h"
+#include "qtsplitterbase_p.h"
 
 /*!
     \qmltype Splitter
diff --git a/src/qtdesktop/qtsplitterbase.h b/src/qtdesktop/qtsplitterbase_p.h
index 8bf4ee4d..8bf4ee4d 100644
--- a/src/qtdesktop/qtsplitterbase.h
+++ b/src/qtdesktop/qtsplitterbase_p.h
diff --git a/src/qtdesktop/qwheelarea.cpp b/src/qtdesktop/qwheelarea.cpp
index c5180d2a..3bf8016c 100644
--- a/src/qtdesktop/qwheelarea.cpp
+++ b/src/qtdesktop/qwheelarea.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qwheelarea.h"
+#include "qwheelarea_p.h"
 
 /*!
     \qmltype WheelArea
diff --git a/src/qtdesktop/qwheelarea.h b/src/qtdesktop/qwheelarea_p.h
index a112607c..a112607c 100644
--- a/src/qtdesktop/qwheelarea.h
+++ b/src/qtdesktop/qwheelarea_p.h
diff --git a/src/qtdesktop/styleplugin.pri b/src/qtdesktop/styleplugin.pri
index 5083a873..6ca28768 100644
--- a/src/qtdesktop/styleplugin.pri
+++ b/src/qtdesktop/styleplugin.pri
@@ -1,19 +1,19 @@
 HEADERS += \
-    qdesktopitem.h \
-    qfiledialogitem.h \
-    qquickcomponentsprivate.h \
-    qquicklayout.h \
+    qdesktopitem_p.h \
+    qfiledialogitem_p.h \
+    qquickcomponentsprivate_p.h \
+    qquicklayout_p.h \
     qquicklayoutengine_p.h \
-    qquicklinearlayout.h \
-    qrangemodel.h \
+    qquicklinearlayout_p.h \
     qrangemodel_p.h \
-    qstyleitem.h \
-    qstyleplugin.h \
-    qtmenu.h \
-    qtmenubar.h \
-    qtmenuitem.h \
-    qtsplitterbase.h \
-    qwheelarea.h
+    qrangemodel_p_p.h \
+    qstyleitem_p.h \
+    qstyleplugin_p.h \
+    qtmenu_p.h \
+    qtmenubar_p.h \
+    qtmenuitem_p.h \
+    qtsplitterbase_p.h \
+    qwheelarea_p.h
 
 SOURCES += \
     qdesktopitem.cpp \