diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:06 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:26 +0200 |
| commit | ef63be14186607c2b806f45d257d8aba6e9a6472 (patch) | |
| tree | f86e663d32e2ad8cfd6ac307dd11526e561c66ba /src/quicktemplates2/qquickpopupitem.cpp | |
| parent | 7eace7ac5a74b68338b948857c4f2bc2e58abc48 (diff) | |
| parent | d6c8721476607f22896785baa547a7551015f164 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Idb1895dae2870dbed860ba3106fe52b01d733504
Diffstat (limited to 'src/quicktemplates2/qquickpopupitem.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index a8d35596..27528f2f 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -105,7 +105,7 @@ QQuickItem *QQuickPopupItemPrivate::getContentItem() { Q_Q(QQuickPopupItem); if (!contentItem) - contentItem = new QQuickItem(q); + return new QQuickItem(q); return contentItem; } |