diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:28:30 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:28:56 +0200 |
| commit | c727b8dea9df50ca9a08bff483128bba6263ac65 (patch) | |
| tree | b2e2b7c20ba400a33721ed86ca51a8da8e8b0d79 /src/core/api | |
| parent | d364c05de52f9ab39034e56cac4e0a7981dc541d (diff) | |
| parent | e3d94abf9356bb8ee6e402fb7b9813c96919faf2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2843a633721212850db77c772caf24e0ea82b450
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index 8f004777f..f5d1e6d39 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -79,9 +79,11 @@ QWEBENGINE_PRIVATE_EXPORT void initialize() return; } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 1)) // Bail out silently if the user did not construct a QGuiApplication. if (!qobject_cast<QGuiApplication *>(app)) return; +#endif if (app->thread() != QThread::currentThread()) { qFatal("QtWebEngine::initialize() must be called from the Qt gui thread."); |