Port to Qt 6.3.0 due CMake/Wasm fixes #1
Conversation
|
BTW this drops Qt5, not sure how to import on QML based on that which is why I found it easier to just drop it |
| @@ -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) | |||
There was a problem hiding this comment.
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.
|
|
||
| SwipeView { | ||
| Background { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
| @@ -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" : "") | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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..
| @@ -9,7 +9,7 @@ | |||
| */ | |||
|
|
|||
| import QtQuick 2.0 | |||
| import QtGraphicalEffects 1.0 // for OpacityMask | |||
| import Qt5Compat.GraphicalEffects // for OpacityMask | |||
There was a problem hiding this comment.
And this is annoying to keep working across 5 and 6.
There was a problem hiding this comment.
which is why I just dropped Qt5 :)
|
this is a demo. I don't think we need to support qt5 and qt6. |
No description provided.