diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 469563c4155..b9e8db87895 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -134,6 +134,7 @@ QT_BEGIN_NAMESPACE
         return __VA_ARGS__; \
     }
 
+Q_CORE_EXPORT void qt_call_post_routines();
 Q_GUI_EXPORT bool qt_is_gui_used = true;
 
 Qt::MouseButtons QGuiApplicationPrivate::mouse_buttons = Qt::NoButton;
@@ -678,6 +679,8 @@ QGuiApplication::~QGuiApplication()
 {
     Q_D(QGuiApplication);
 
+    qt_call_post_routines();
+
     d->eventDispatcher->closingDown();
     d->eventDispatcher = nullptr;
 
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 42135dae247..3187ea3720f 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -25,7 +25,8 @@ SUBDIRS=\
    qguiapplication \
    qpixelformat \
    qopenglwindow \
-   qrasterwindow
+   qrasterwindow \
+   qaddpostroutine
 
 win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop
 
diff --git a/tests/auto/gui/kernel/qaddpostroutine/qaddpostroutine.pro b/tests/auto/gui/kernel/qaddpostroutine/qaddpostroutine.pro
new file mode 100644
index 00000000000..e67720b5d5c
--- /dev/null
+++ b/tests/auto/gui/kernel/qaddpostroutine/qaddpostroutine.pro
@@ -0,0 +1,7 @@
+CONFIG += testcase
+TARGET = tst_qaddpostroutine
+
+QT += testlib
+
+SOURCES  += tst_qaddpostroutine.cpp
+
diff --git a/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp b/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp
new file mode 100644
index 00000000000..500543d2e16
--- /dev/null
+++ b/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QTimer>
+
+static bool done = false;
+
+static void cleanup()
+{
+     done = true;
+     QEventLoop loop;
+     QTimer::singleShot(100,&loop, &QEventLoop::quit);
+     loop.exec();
+}
+
+struct tst_qAddPostRoutine : public QObject
+{
+public:
+    tst_qAddPostRoutine();
+    ~tst_qAddPostRoutine();
+};
+
+tst_qAddPostRoutine::tst_qAddPostRoutine()
+{
+    qAddPostRoutine(cleanup);
+}
+
+tst_qAddPostRoutine::~tst_qAddPostRoutine()
+{
+    Q_ASSERT(done);
+}
+int main(int argc, char *argv[])
+{
+    tst_qAddPostRoutine tc;
+    QGuiApplication app(argc, argv);
+    app.setAttribute(Qt::AA_Use96Dpi, true);
+    QTEST_SET_MAIN_SOURCE_PATH
+    return QTest::qExec(&tc, argc, argv);
+}