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 /examples/webengine/minimal | |
| 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 'examples/webengine/minimal')
| -rw-r--r-- | examples/webengine/minimal/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp index 8bcd0e0e9..86109f97a 100644 --- a/examples/webengine/minimal/main.cpp +++ b/examples/webengine/minimal/main.cpp @@ -57,9 +57,8 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); - QGuiApplication app(argc, argv); - QtWebEngine::initialize(); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); |