summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorSzabolcs David <[email protected]>2023-03-08 15:04:07 +0100
committerSzabolcs David <[email protected]>2023-04-05 10:50:54 +0000
commit1fe0003d727bdacd30c552f01000c434971ad3ca (patch)
tree9bb8e594214e02c8230cea07387d47850bee9505 /src/main.cpp
parenta09ec269e8b296d39d78b45ae251edb3d7bada41 (diff)
Update project to work with Qt 6HEADdev
Also fix an old issue: tab view now presents preview images. Change-Id: I47eb48b626e62e53e130734c92cc7ec8ed9ecb66 Reviewed-by: Michal Klocek <[email protected]>
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e21440a..4d2ce08 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@
#include <QQmlContext>
#include <QQmlEngine>
#include <QQuickView>
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick>
static QObject *engine_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
{
@@ -71,6 +71,8 @@ int main(int argc, char **argv)
int qAppArgCount = qargv.size();
+ QtWebEngineQuick::initialize();
+
#if defined(DESKTOP_BUILD)
TouchMockingApplication app(qAppArgCount, qargv.data());
#else
@@ -81,8 +83,6 @@ int main(int argc, char **argv)
qmlRegisterType<TouchTracker>("WebBrowser", 1, 0, "TouchTracker");
qmlRegisterSingletonType<AppEngine>("WebBrowser", 1, 0, "AppEngine", engine_factory);
- QtWebEngine::initialize();
-
app.setOrganizationName("The Qt Company");
app.setOrganizationDomain("qt.io");
app.setApplicationName("qtwebbrowser");
@@ -98,8 +98,7 @@ int main(int argc, char **argv)
#if defined(DESKTOP_BUILD)
view.show();
- if (view.size().isEmpty())
- view.setGeometry(0, 0, 800, 600);
+ view.setGeometry(0, 0, 1024, 600);
#else
view.showFullScreen();
#endif