diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
| commit | 48591ce7dc00ec2c00ec3983a9572398fbd794b8 (patch) | |
| tree | 304d40ab40e181aac8fe4e49e4ab9f274c52c1d9 /src/quickwidgets | |
| parent | b4ccdf004af8ab5b9e327abf7f87d0bd34ee13c0 (diff) | |
| parent | e0a3c6276a257aeb1cb3ef6d16a4dddcc65d8195 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I19804e880005c66880eeabfaebf0b1093de80e6b
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index ed7f7a0ca6..4ed41a0c6c 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1589,9 +1589,6 @@ QQuickWindow *QQuickWidget::quickWindow() const return d->offscreenWindow; } -QT_END_NAMESPACE - - void QQuickWidget::paintEvent(QPaintEvent *event) { Q_UNUSED(event) @@ -1612,3 +1609,5 @@ void QQuickWidget::paintEvent(QPaintEvent *event) } } } + +QT_END_NAMESPACE |