Skip to content

Commit 11f1e67

Browse files
committed
Fixup build on new webengine
1 parent c27bda3 commit 11f1e67

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
1212
include(FeatureSummary)
1313
include(GNUInstallDirs)
1414

15-
set(QT_MIN_VERSION "5.11.0")
15+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
16+
set(CMAKE_INSTALL_PREFIX /usr)
17+
18+
set(QT_MIN_VERSION "6.0.0")
1619
find_package(Qt6 COMPONENTS Gui Qml Quick Sql WebEngineQuick LinguistTools REQUIRED)
17-
find_package(Glacier 0.8 COMPONENTS App REQUIRED)
20+
find_package(Glacier 1.0 COMPONENTS App REQUIRED)
1821

1922
add_subdirectory(src)
2023

src/main.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <QScreen>
88
#include <QtQml>
99
#include <QtQuick/QQuickView>
10+
#include <QtWebEngineQuick>
1011

1112
#include <glacierapp.h>
1213

@@ -19,13 +20,7 @@ Q_DECL_EXPORT int main(int argc, char* argv[])
1920
QGuiApplication* app = GlacierApp::app(argc, argv);
2021
app->setOrganizationName("NemoMobile");
2122

22-
// QScreen* sc = app->primaryScreen();
23-
// if (sc) {
24-
// sc->setOrientationUpdateMask(Qt::LandscapeOrientation
25-
// | Qt::PortraitOrientation
26-
// | Qt::InvertedLandscapeOrientation
27-
// | Qt::InvertedPortraitOrientation);
28-
// }
23+
QtWebEngineQuick::initialize();
2924

3025
qmlRegisterType<BookmarksModel>("org.glacier.browser", 1, 0, "BookmarksModel");
3126
qmlRegisterType<HistoryModel>("org.glacier.browser", 1, 0, "HistoryModel");

0 commit comments

Comments
 (0)