From b3091b74fc46c233b76cf70b5fd5b9027600dfbf Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Mon, 14 Oct 2024 16:52:53 +0200
Subject: [PATCH] fix: build issues
---
CMakeLists.txt | 3 ++-
emsdk | 2 +-
qtquickdesigner-components | 2 +-
src/designviewer.cpp | 5 +++--
www/resources/styles/default.css | 10 +++++++++-
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc0065e..c2e4d80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(
REQUIRED
)
-set(QT_MINIMUM_VERSION 6.7.0)
+set(QT_MINIMUM_VERSION 6.8.0)
if(QT_VERSION VERSION_LESS QT_MINIMUM_VERSION)
message(FATAL_ERROR "Minimum supported Qt version: ${QT_MINIMUM_VERSION}")
endif()
@@ -65,6 +65,7 @@ install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.html
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wasm
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.js
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.worker.js
FILES ${CMAKE_CURRENT_BINARY_DIR}/qtloader.js
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
diff --git a/emsdk b/emsdk
index a36df02..d52c465 160000
--- a/emsdk
+++ b/emsdk
@@ -1 +1 @@
-Subproject commit a36df02dc438e8b02f91122a4c62eeecb6784272
+Subproject commit d52c46520124845b1e0e0525f2759299d840143f
diff --git a/qtquickdesigner-components b/qtquickdesigner-components
index 80b9e31..20397e2 160000
--- a/qtquickdesigner-components
+++ b/qtquickdesigner-components
@@ -1 +1 @@
-Subproject commit 80b9e31a8863c9bf2a57c3d569b761d9df71cdb3
+Subproject commit 20397e26370ff073125fd19f77c7ad013276b5bd
diff --git a/src/designviewer.cpp b/src/designviewer.cpp
index 54e18db..591bc58 100644
--- a/src/designviewer.cpp
+++ b/src/designviewer.cpp
@@ -27,6 +27,7 @@
#include <emscripten.h>
#include <emscripten/val.h>
+
#include <functional>
#include <QBuffer>
@@ -328,8 +329,8 @@ void DesignViewer::showAppWindow()
size = QSize(contentItem->width(), contentItem->height());
}
- qtContainerStyle.set("width", std::format("{}px", size.width()));
- qtContainerStyle.set("height", std::format("{}px", size.height()));
+ qtContainerStyle.set("width", std::to_string(size.width()) + "px");
+ qtContainerStyle.set("height", std::to_string(size.height()) + "px");
qDebug() << "Showing the QML app window";
m_quickWindow->show();
diff --git a/www/resources/styles/default.css b/www/resources/styles/default.css
index 7fbcc93..3dcf6bf 100644
--- a/www/resources/styles/default.css
+++ b/www/resources/styles/default.css
@@ -14,7 +14,15 @@
font-weight: 100;
font-style: italic;
}
-
+html,
+body {
+ background-color: #262525;
+ color: #e0e0e0;
+ font-family: Titillium;
+ font-size: 1.1em;
+ font-weight: 100;
+ font-style: italic;
+}
a {
color: #e0e0e0;
}
--
GitLab