diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-11-09 11:36:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-10 00:14:58 +0100 |
| commit | 7ca2207ac056fd481751ae6a12de9b0e5da1eb23 (patch) | |
| tree | 45a3cc8d9e39f435a413dbc5867774c3ee8bc8e6 /src | |
| parent | 98ad7efd3d2c915d264a63e01f7d6366da3b1c84 (diff) | |
Preparation for changing QWindow::windowState to visibility
QQuickWindow needs to avoid depending on QWindowPrivate::visible.
It can go back to using private variables after the replacment is done.
Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index b341c6b7df..64fea0bfc8 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1996,7 +1996,11 @@ bool QQuickWindowPrivate::isRenderable() const { if (geometry.width() <= 0 || geometry.height() <= 0) return false; - return visible || (renderWithoutShowing && platformWindow); + // Change to be applied after the visibility property is integrated in qtbase: +// return visibility != QWindow::Hidden || (renderWithoutShowing && platformWindow); + // Temporary version which is implementation-agnostic but slightly less efficient: + const QQuickWindow *q = q_func(); + return q->isVisible() || (renderWithoutShowing && platformWindow); } /*! |