diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:45:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:46:16 +0200 |
| commit | f447493bf9a8cf3490da0f5409d76e7f7fc98759 (patch) | |
| tree | 3a7849bd636b820b211c24885e7cdb72334338c6 /src/quicktemplates2/qquicktextarea.cpp | |
| parent | 4696c5609ae5741a841d2222c45c1e020c03db25 (diff) | |
| parent | 4a8c2605c26acf575e181682f083e077b815ab4b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I509cd2e02874d9a2fe0febf8cc667833b7072b23
Diffstat (limited to 'src/quicktemplates2/qquicktextarea.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index a13213fd20..45a084d24d 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -529,7 +529,10 @@ void QQuickTextArea::setBackground(QQuickItem *background) delete d->background; d->background = background; if (background) { - background->setParentItem(this); + if (d->flickable) + background->setParentItem(d->flickable); + else + background->setParentItem(this); if (qFuzzyIsNull(background->z())) background->setZ(-1); if (isComponentComplete()) |