diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-13 17:25:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-13 17:25:16 +0200 |
| commit | 2dce0008ce53d27d281ad2dc00eb32d25ae5fc84 (patch) | |
| tree | 55d97b68f56b78f3388cdaaa4ae69648b7057f68 /src/webenginequick/api/qtwebengineglobal.cpp | |
| parent | 919dd97e835f469609a0710eb91f829a6d70e88c (diff) | |
| parent | 8fe660ecbbe1f126ce0da694adff956ad7159870 (diff) | |
| download | qtwebengine-2dce0008ce53d27d281ad2dc00eb32d25ae5fc84.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia01415e5a44b1df9ed8b3966ff3b39a414b1563c
Diffstat (limited to 'src/webenginequick/api/qtwebengineglobal.cpp')
| -rw-r--r-- | src/webenginequick/api/qtwebengineglobal.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webenginequick/api/qtwebengineglobal.cpp b/src/webenginequick/api/qtwebengineglobal.cpp index 825805888..7d2b91e90 100644 --- a/src/webenginequick/api/qtwebengineglobal.cpp +++ b/src/webenginequick/api/qtwebengineglobal.cpp @@ -73,8 +73,7 @@ namespace QtWebEngine { */ void initialize() { - QCoreApplication *app = QCoreApplication::instance(); - if (app) { + if (!QCoreApplication::startingUp()) { qWarning("QtWebEngine::initialize() called with QCoreApplication object already created and should be call before. "\ "This is depreciated and may fail in the future."); QtWebEngineCore::initialize(); |