diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-22 12:10:12 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-22 14:09:23 +0000 |
| commit | 7427e2808324388678eefda45b3e83c675979290 (patch) | |
| tree | 2fe0308a0c84d8fd55ff1a3664565b2f5536dd6b /src/controls | |
| parent | 482ecb0fdc011687eec3df5803653be88f14f539 (diff) | |
Refactor Popup
Added relevant properties to make it almost like a Control: x, y,
width, height, padding, background... This change makes popup use
an internal item where the style/user-supplied contentItem and
background are re-parented. This way we can provide a default style
(background) for Popup.
Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
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 a44c8c99..05f4fbff 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.h> +#include <QtLabsTemplates/private/qquickpopup_p_p.h> QT_BEGIN_NAMESPACE @@ -118,7 +118,7 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob } } } else if (QQuickPopup *popup = qobject_cast<QQuickPopup *>(object)) { - item = popup->contentItem(); + item = QQuickPopupPrivate::get(popup)->popupItem; QQuickStyle *style = attachedStyle(type, popup); if (style) |