diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-02 16:23:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-22 18:03:15 +0200 |
| commit | 229621361562d0e89aeb5f2d2f0ace0115bf164c (patch) | |
| tree | 4bf2425711971e24a83138cd20811cecf676eb33 /src/core/api/qtwebenginecoreglobal.cpp | |
| parent | b3f9b66e6b43087873c7fc6518c0197201fd04c7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/webengine/minimal/main.cpp
src/3rdparty
src/core/net/url_request_custom_job.cpp
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
Change-Id: I33994024a4be5ed787800c5718a0a443b970c36d
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/api/qtwebenginecoreglobal.cpp')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index 0fddacb15..b27de4c23 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -108,7 +108,7 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize() QCoreApplication *app = QCoreApplication::instance(); if (!app) { - qFatal("QtWebEngine::initialize() must be called after the construction of the application object."); + qFatal("QtWebEngine::initialize() but no core application instance."); return; } |