diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:20:42 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:22:53 +0100 |
commit | 8318deb165047d592523ec0b2fd10510d4953b37 (patch) | |
tree | e80c082fbe6918e489f61d4f06deb29bbc12fa32 /src/controls | |
parent | 85dc3eb5d0e19d024083a9776d1ac8cf31d708ca (diff) | |
parent | 135b5cdecaeaecb1f3afe01103eac5970399efa7 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
src/templates/qquickapplicationwindow_p.h
src/templates/qquickcombobox.cpp
src/templates/qquickcombobox_p.h
src/templates/qquickpopup.cpp
Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
Diffstat (limited to 'src/controls')
-rw-r--r-- | src/controls/qquickstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp index 576506fb..320148c3 100644 --- a/src/controls/qquickstyle.cpp +++ b/src/controls/qquickstyle.cpp @@ -40,7 +40,7 @@ #include <QtCore/qsettings.h> #include <QtCore/qfileselector.h> #include <QtQuick/private/qquickitem_p.h> -#include <QtLabsTemplates/private/qquickpopup_p_p.h> +#include <QtLabsTemplates/private/qquickpopup_p.h> QT_BEGIN_NAMESPACE @@ -119,7 +119,7 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob } } } else if (QQuickPopup *popup = qobject_cast<QQuickPopup *>(object)) { - item = QQuickPopupPrivate::get(popup)->popupItem; + item = popup->popupItem(); QQuickStyle *style = attachedStyle(type, popup); if (style) |