diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
| commit | 0524ddb9489cd9816fadc330f75efc7b40994013 (patch) | |
| tree | 834607a15e646d416e2512f8f4a05ae222495de5 /src/quicktemplates2/qquickmenu_p_p.h | |
| parent | 2568869819863de6b1f303dfe470aedf38b841c3 (diff) | |
| parent | 53c780f15c2d170514f74d949a8165033275bddd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/material/qquickmaterialstyle.cpp
src/imports/controls/universal/qquickuniversalstyle.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquicktooltip.cpp
tests/auto/auto.pro
Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
Diffstat (limited to 'src/quicktemplates2/qquickmenu_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index 4137112d..4ca3c379 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_p.h @@ -50,7 +50,6 @@ #include <QtCore/qvector.h> #include <QtCore/qpointer.h> -#include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQuickTemplates2/private/qquickpopup_p_p.h> @@ -58,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQmlObjectModel; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate { Q_DECLARE_PUBLIC(QQuickMenu) |