diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-24 21:10:29 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-24 22:37:52 +0200 |
commit | a1d2bf257e5240aadcd0d3b95f04ee2c86925b88 (patch) | |
tree | 874e4cc617fdae7e558a1ee653b9e2fbf3df1ad2 /src/gui/kernel/qwindow.cpp | |
parent | 223f5c0273452b1ccd48b6f1057598f507a1b2b9 (diff) | |
parent | abd3b8030cbcc50379578b88ce6019e338ff8597 (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 327544c59c..8159b7746e 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1119,6 +1119,11 @@ Qt::WindowState QWindow::windowState() const void QWindow::setTransientParent(QWindow *parent) { Q_D(QWindow); + if (parent && !parent->isTopLevel()) { + qWarning() << Q_FUNC_INFO << parent << "must be a top level window."; + return; + } + d->transientParent = parent; QGuiApplicationPrivate::updateBlockedStatus(this); |