Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to Qt 6.3.0 due CMake/Wasm fixes #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to Qt 6.3.0 due CMake/Wasm fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,32 @@

project(KDABBoatDemo)
cmake_minimum_required(VERSION 3.9)
find_package(Qt5 CONFIG REQUIRED COMPONENTS Core Gui Quick)

find_package(Qt6 6.3.0 COMPONENTS Core Quick Core5Compat REQUIRED)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Random question, do we want to drop Qt 5 support entirely, or keep this code compile in both 5 and 6?

(I don't know if a decision has been made in that regard.)

Of course one can require Qt 6 for a WASM build.


set(QT_WASM_INITIAL_MEMORY "64MB")

set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC TRUE)
set(CMAKE_AUTORCC TRUE)

add_executable(KDABBoatDemo
main.cpp
imagesMaps.qrc
imagesMaps2.qrc
images.qrc
data.qrc
qt_add_executable(KDABBoatDemo
MANUAL_FINALIZATION
main.cpp
imagesMaps.qrc
imagesMaps2.qrc
images.qrc
data.qrc
)

target_compile_definitions(KDABBoatDemo
PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
target_link_libraries(KDABBoatDemo
PRIVATE
Qt::Core
Qt::Gui
Qt::Quick
Qt::Core5Compat
)
target_link_libraries(KDABBoatDemo Qt5::Core Qt5::Gui Qt5::Quick)
qt_import_qml_plugins(KDABBoatDemo)
qt_finalize_executable(KDABBoatDemo)
19 changes: 14 additions & 5 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@

int main(int argc, char *argv[])
{
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QGuiApplication app(argc, argv);

QQmlApplicationEngine engine;

#if !defined(Q_OS_WASM)
QCommandLineParser parser;
parser.setApplicationDescription("KDAB Nautical UI - concept of the next generation UI for sailing boats");
parser.addHelpOption();
Expand Down Expand Up @@ -64,13 +66,13 @@ int main(int argc, char *argv[])
if (!primaryScreen)
qFatal("Cannot determine the primary screen");

QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty("_canCloseDemoFromUI", QVariant::fromValue(parser.isSet(quitOption)));
engine.rootContext()->setContextProperty("_showFullscreen", QVariant::fromValue(parser.isSet(fullscreenOption)));

if (parser.isSet(portraitOption) && parser.isSet(landscapeOption))
qFatal("Cannot set both landscape and portrait at the same time");


engine.rootContext()->setContextProperty("_canCloseDemoFromUI", QVariant::fromValue(parser.isSet(quitOption)));
engine.rootContext()->setContextProperty("_showFullscreen", QVariant::fromValue(parser.isSet(fullscreenOption)));

const bool portrait = [&]() {
if (parser.isSet(portraitOption)) {
return true;
Expand Down Expand Up @@ -98,6 +100,13 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("_windowWidth", QVariant::fromValue(portrait ? 720 : 1280));
engine.rootContext()->setContextProperty("_windowHeight", QVariant::fromValue(portrait ? 1280 : 720));
}
#else
engine.rootContext()->setContextProperty("_windowWidth", -1);
engine.rootContext()->setContextProperty("_windowHeight", -1);
engine.rootContext()->setContextProperty("_portrait", false);
engine.rootContext()->setContextProperty("_isLowRes", false);
engine.rootContext()->setContextProperty("_showFullscreen", true);
#endif

const QUrl url(QStringLiteral("qrc:/resources/Main.qml"));
QObject::connect(
Expand Down
194 changes: 99 additions & 95 deletions resources/Main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,120 +36,124 @@ ApplicationWindow {
}

Item {
anchors.centerIn: base.contentItem
width: _portrait ? base.height : base.width
height: _portrait ? base.width : base.height
rotation: _portrait ? 90 : 0

Background {
anchors.fill: parent
rotateCompass: menuArea.expanded
}
anchors.fill: parent

AppPage {
id: pagesArea
width: parent.width*1.4
height: parent.height
widthOffset: width - parent.width + 80
x: menuArea.expanded ? parent.width : 80
title: menuArea.currentItemText
Item {
anchors.centerIn: parent
width: _portrait ? parent.height : parent.width
height: _portrait ? parent.width : parent.height
rotation: _portrait ? 90 : 0

SwipeView {
Background {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to test the changes in here to understand what they're about.

Are they self contained? I guess they could be split in their own commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just added another Item to fill the parent, because wasm was not starting at the right size (only after a click it noticed the window size), with this it just works

anchors.fill: parent
anchors.rightMargin: pagesArea.widthOffset
interactive: false
currentIndex: menuArea.currentIndex
clip: true
rotateCompass: menuArea.expanded
}

Loader {
AppPage {
id: pagesArea
width: parent.width*1.4
height: parent.height
widthOffset: width - parent.width + 80
x: menuArea.expanded ? parent.width : 80
title: menuArea.currentItemText

SwipeView {
anchors.fill: parent
anchors.rightMargin: pagesArea.widthOffset
interactive: false
currentIndex: menuArea.currentIndex
clip: true
visible: SwipeView.isCurrentItem
sourceComponent: _isLowRes ? smallBoatStatus : normalBoatStatus
Component {
id: normalBoatStatus
BoatStatusContents { }

Loader {
clip: true
visible: SwipeView.isCurrentItem
sourceComponent: _isLowRes ? smallBoatStatus : normalBoatStatus
Component {
id: normalBoatStatus
BoatStatusContents { }
}
Component {
id: smallBoatStatus
BoatStatusContentsSmall { }
}
}
Component {
id: smallBoatStatus
BoatStatusContentsSmall { }

Loader {
clip: true
visible: SwipeView.isCurrentItem
sourceComponent: _isLowRes ? smallBoatSailing : normalBoatSailing
Component {
id: normalBoatSailing
BoatSailingContents { }
}
Component {
id: smallBoatSailing
BoatSailingContentsSmall { }
}
}
}

Loader {
clip: true
visible: SwipeView.isCurrentItem
sourceComponent: _isLowRes ? smallBoatSailing : normalBoatSailing
Component {
id: normalBoatSailing
BoatSailingContents { }
PageNavigation {
visible: SwipeView.isCurrentItem
clip: true
}
Component {
id: smallBoatSailing
BoatSailingContentsSmall { }
Radio {
visible: SwipeView.isCurrentItem
clip: true
}
PlayItem {
visible: SwipeView.isCurrentItem
clip: true
}
}

PageNavigation {
visible: SwipeView.isCurrentItem
clip: true
}
Radio {
visible: SwipeView.isCurrentItem
clip: true
}
PlayItem {
visible: SwipeView.isCurrentItem
clip: true
}

AboutItem {
id: aboutItem
visible: SwipeView.isCurrentItem
AboutItem {
id: aboutItem
visible: SwipeView.isCurrentItem
}
}
}
}

AppMenu {
id: menuArea
height: parent.height
AppMenu {
id: menuArea
height: parent.height

model: ListModel {
ListElement {
name: qsTr("Boat Status")
iconText: "icon1"
}
ListElement {
name: qsTr("Sailing")
iconText: "icon2"
}
ListElement {
name: qsTr("Navigation")
iconText: "icon5"
}
ListElement {
name: qsTr("Com. Radio")
iconText: "icon3"
}
ListElement {
name: qsTr("Music Player")
iconText: "icon4"
}
ListElement {
name: qsTr("About KDAB")
iconText: "icon6"
model: ListModel {
ListElement {
name: qsTr("Boat Status")
iconText: "icon1"
}
ListElement {
name: qsTr("Sailing")
iconText: "icon2"
}
ListElement {
name: qsTr("Navigation")
iconText: "icon5"
}
ListElement {
name: qsTr("Com. Radio")
iconText: "icon3"
}
ListElement {
name: qsTr("Music Player")
iconText: "icon4"
}
ListElement {
name: qsTr("About KDAB")
iconText: "icon6"
}
}
}
}

MouseArea {
onClicked: Qt.quit()
enabled: canCloseDemoFromUI
anchors.right: parent.right
anchors.top: parent.top
width: 50
height: 50
}
MouseArea {
onClicked: Qt.quit()
enabled: canCloseDemoFromUI
anchors.right: parent.right
anchors.top: parent.top
width: 50
height: 50
}

}
}
}

2 changes: 1 addition & 1 deletion resources/Map.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Flickable {
flickDeceleration: 350
Image {
id: image
source: "/img/maps/resources/images/maps/shot"+map.numberi
source: "/img/maps/resources/images/maps/shot" + map.numberi + (Qt.platform.os === "wasm" ? ".png" : "")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is weird.

Is this a Qt 6 regression? Is there a bug report somewhere? Qt is supposed to detect that one can't load compressed textures and fall back on the .png files gracefully.

Side note: if WASM can't make use of the compressed textures at all (don't really know, need to check), then it's worth splitting the .qrc files and not shipping such textures on this platform.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To me it's a regression, didn't look at bug reports, it certainly would be good to remove them as they probably add ~4MB..

anchors.centerIn: parent
}
}
2 changes: 1 addition & 1 deletion resources/Mask.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

import QtQuick 2.0
import QtGraphicalEffects 1.0 // for OpacityMask
import Qt5Compat.GraphicalEffects // for OpacityMask
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this is annoying to keep working across 5 and 6.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which is why I just dropped Qt5 :)


Item {
id: mask
Expand Down