summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-06 06:56:27 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-09-06 06:56:27 +0000
commit23ef3b04ebfc0c7a87800b4ff09444c854e31fdb (patch)
tree5a3509a5de492bf13e8f9dfb96b0cbaaa72dc6d0 /src/gui/kernel/qwindow.cpp
parentbeaa792e2021aad52ecd98a0e0f0f48571069dba (diff)
parentd892e6f721b0163dfb2f2ecf79d80ba62304a542 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
-rw-r--r--src/gui/kernel/qwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 5f71bdaded..18e8bcf99c 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -2195,6 +2195,9 @@ void QWindowPrivate::deliverUpdateRequest()
*/
void QWindow::requestUpdate()
{
+ Q_ASSERT_X(QThread::currentThread() == QCoreApplication::instance()->thread(),
+ "QWindow", "Updates can only be scheduled from the GUI (main) thread");
+
Q_D(QWindow);
if (d->updateRequestPending || !d->platformWindow)
return;