aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/controls/fusion/qquickfusionstyle_p.h3
-rw-r--r--src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm2
-rw-r--r--src/imports/nativestyle/qstyle/qquickcommonstyle.cpp2
-rw-r--r--src/imports/nativestyle/qstyle/qquickcommonstyle_p.h1
-rw-r--r--src/quicktemplates2/qquickdialog_p.h2
-rw-r--r--src/quicktemplates2/qquickdialogbuttonbox_p.h2
-rw-r--r--src/quicktemplates2/qquicktextarea_p.h2
-rw-r--r--src/quicktemplates2/qquicktextfield_p.h3
8 files changed, 7 insertions, 10 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle_p.h b/src/imports/controls/fusion/qquickfusionstyle_p.h
index 4655fd3d..c609e9c6 100644
--- a/src/imports/controls/fusion/qquickfusionstyle_p.h
+++ b/src/imports/controls/fusion/qquickfusionstyle_p.h
@@ -51,11 +51,10 @@
#include <QtCore/qobject.h>
#include <QtGui/qcolor.h>
#include <QtQml/qqml.h>
+#include <QtQuick/private/qquickpalette_p.h>
QT_BEGIN_NAMESPACE
-class QQuickPalette;
-
class QQuickFusionStyle : public QObject
{
Q_OBJECT
diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm
index e61bdafa..bf638e8e 100644
--- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm
+++ b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm
@@ -2391,7 +2391,7 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, QStyleHintReturn
ret = true;
break;
case SH_Slider_AbsoluteSetButtons:
- ret = Qt::LeftButton|Qt::MidButton;
+ ret = Qt::LeftButton|Qt::MiddleButton;
break;
case SH_Slider_PageSetButtons:
ret = 0;
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
index d7b97f21..6e662e3d 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
+++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
@@ -4724,7 +4724,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, QStyleHintRet
ret = false;
break;
case SH_Slider_AbsoluteSetButtons:
- ret = Qt::MidButton;
+ ret = Qt::MiddleButton;
break;
case SH_Slider_PageSetButtons:
ret = Qt::LeftButton;
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h b/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h
index 2fed0cad..ba2b8689 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h
+++ b/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
// We mean it.
//
-class QStringList;
class QTextOption;
namespace QQC2 {
diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h
index 20f56f6b..660da081 100644
--- a/src/quicktemplates2/qquickdialog_p.h
+++ b/src/quicktemplates2/qquickdialog_p.h
@@ -48,13 +48,13 @@
// We mean it.
//
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates2/private/qquickpopup_p.h>
#include <QtGui/qpa/qplatformdialoghelper.h>
QT_BEGIN_NAMESPACE
class QQuickDialogPrivate;
-class QQuickAbstractButton;
class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup
{
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h
index b1687df7..48e721e5 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h
@@ -48,13 +48,13 @@
// We mean it.
//
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates2/private/qquickcontainer_p.h>
#include <QtGui/qpa/qplatformdialoghelper.h>
QT_BEGIN_NAMESPACE
class QQmlComponent;
-class QQuickAbstractButton;
class QQuickDialogButtonBoxPrivate;
class QQuickDialogButtonBoxAttached;
class QQuickDialogButtonBoxAttachedPrivate;
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index fed0eb59..e9812f19 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -50,6 +50,7 @@
#include <QtGui/qpalette.h>
#include <QtQuick/private/qquicktextedit_p.h>
+#include <QtQuick/private/qquickevents_p_p.h>
#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
QT_BEGIN_NAMESPACE
@@ -57,7 +58,6 @@ QT_BEGIN_NAMESPACE
class QQuickText;
class QQuickTextAreaPrivate;
class QQuickTextAreaAttached;
-class QQuickMouseEvent;
class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit
{
diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h
index b1b9715c..a1d433c0 100644
--- a/src/quicktemplates2/qquicktextfield_p.h
+++ b/src/quicktemplates2/qquicktextfield_p.h
@@ -50,13 +50,12 @@
#include <QtGui/qpalette.h>
#include <QtQuick/private/qquicktextinput_p.h>
+#include <QtQuick/private/qquickevents_p_p.h>
#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
QT_BEGIN_NAMESPACE
-class QQuickText;
class QQuickTextFieldPrivate;
-class QQuickMouseEvent;
class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextField : public QQuickTextInput
{