From 537c01cb7297b10cfc81a7c75c04ea8035dd0eb3 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Thu, 16 Dec 2021 14:28:29 -0500 Subject: [PATCH] Reduce MW min size & use Qt 6.2.2 --- .github/workflows/codeql-analysis.yml | 5 +++-- .github/workflows/deploy.yml | 28 +++++++++++++++------------ README.md | 3 ++- assets/qml/Windows/MainWindow.qml | 4 ++-- doc/README_DE.md | 3 ++- doc/README_ES.md | 3 ++- doc/README_ZH.md | 3 ++- libs/qtcsv | 2 +- msys2/PKGBUILD | 2 +- 9 files changed, 31 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6602f0e6..aa393537 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,13 +38,14 @@ jobs: uses: actions/cache@v1 with: path: ../Qt - key: ${{runner.os}}-qtcachedir-5.15.2 + key: ${{runner.os}}-qtcachedir-6.2.2 - name: '⚙️ Install Qt' uses: jurplel/install-qt-action@v2 with: - version: 5.15.2 + version: 6.2.2 aqtversion: '==2.0.0' + modules: qtserialport qt5compat cached: ${{steps.cache-qt.outputs.cache-hit}} - name: '⚙️ Install dependencies' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ec7a1ad..58b2a240 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,8 +26,8 @@ env: QML_DIR_WIN: "assets\\qml" PUBLISHER: "Alex Spataru" REPO_DIR: "/home/runner/work/Serial-Studio/Serial-Studio" - QT_VERSION: 5.15.2 - QMAKE: qmake + QT_VERSION: 6.2.2 + QMAKE: qmake6 CORES: 12 #-------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: version: ${{env.QT_VERSION}} - #modules: qtserialport qt5compat + modules: qtserialport qt5compat aqtversion: '==2.0.0' cached: ${{steps.cache-qt.outputs.cache-hit}} @@ -72,17 +72,21 @@ jobs: ${{env.QMAKE}} ${{env.QMAKE_PROJECT}} CONFIG+=release PREFIX=/usr make -j${{env.CORES}} - - name: '⚙️ Install linuxdeployqt' + - name: '⚙️ Install linuxdeploy' run: | - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -O linuxdeployqt - chmod a+x linuxdeployqt + wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage + wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage + chmod +x linuxdeploy-x86_64.AppImage + chmod +x linuxdeploy-plugin-qt-x86_64.AppImage - name: '📦 Create AppImage' run: | - make INSTALL_ROOT=appdir install - ./linuxdeployqt appdir/usr/share/applications/*.desktop -appimage -bundle-non-qt-libs -extra-plugins=imageformats/libqsvg.so -qmldir="${{env.QML_DIR_NIX}}" - # Rename AppImage to match "%AppName%-%Version%-Linux.AppImage" format - mv Serial_Studio-${{env.VERSION}}-x86_64.AppImage ${{env.EXECUTABLE}}-${{env.VERSION}}-Linux.AppImage + export QML_SOURCES_PATHS="${{env.QML_DIR_NIX}}" + export PATH=/home/runner/work/Serial-Studio/Qt/6.2.0/gcc_64/libexec:$PATH + ./linuxdeploy-x86_64.AppImage --appdir AppDir -e ${{env.UNIXNAME}} -i deploy/linux/${{env.UNIXNAME}}.png -d deploy/linux/${{env.UNIXNAME}}.desktop --plugin qt --output appimage + rm linuxdeploy-x86_64.AppImage + rm linuxdeploy-plugin-qt-x86_64.AppImage + mv *.AppImage ${{env.EXECUTABLE}}-${{env.VERSION}}-Linux.AppImage - name: '📤 Upload artifact: AppImage' uses: actions/upload-artifact@v2 @@ -112,7 +116,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: version: ${{env.QT_VERSION}} - #modules: qtserialport qt5compat + modules: qtserialport qt5compat aqtversion: '==2.0.0' cached: ${{steps.cache-qt.outputs.cache-hit}} @@ -164,7 +168,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: version: ${{env.QT_VERSION}} - #modules: qtserialport qt5compat + modules: qtserialport qt5compat aqtversion: '==2.0.0' cached: ${{steps.cache-qt.outputs.cache-hit}} diff --git a/README.md b/README.md index 42b42258..6b49b72b 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ This project is released under the MIT license, for more information, check the ### Requirements -The only requirement to compile the application is to have [Qt](http://www.qt.io/download-open-source/) installed in your system. The desktop application will compile with **Qt 5.15**. +The only requirement to compile the application is to have [Qt](http://www.qt.io/download-open-source/) installed in your system. The desktop application will compile with **Qt 6.2.2**. On GNU/Linux systems, you will also need to install `libgl1-mesa-dev` in order to compile the application. @@ -68,6 +68,7 @@ Full list of used Qt modules: - Qt Print Support - Qt Quick Widgets - Qt Quick Controls 2 +- Qt5 Compatibility Module ### Cloning diff --git a/assets/qml/Windows/MainWindow.qml b/assets/qml/Windows/MainWindow.qml index f34a7066..10a543fa 100644 --- a/assets/qml/Windows/MainWindow.qml +++ b/assets/qml/Windows/MainWindow.qml @@ -95,9 +95,9 @@ FramelessWindow.CustomWindow { title: Cpp_AppName width: minimumWidth height: minimumHeight - minimumWidth: 1250 + 2 * root.shadowMargin + minimumWidth: 1050 + 2 * root.shadowMargin backgroundColor: Cpp_ThemeManager.windowBackground - minimumHeight: 720 + 2 * root.shadowMargin + root.titlebar.height + minimumHeight: 620 + 2 * root.shadowMargin + root.titlebar.height // // Startup code diff --git a/doc/README_DE.md b/doc/README_DE.md index 70b231dd..3e913d59 100644 --- a/doc/README_DE.md +++ b/doc/README_DE.md @@ -27,7 +27,7 @@ Darüber hinaus kann dieser Ansatz auf nahezu jede Art von Projekt ausgedehnt we #### Bedarf -Die einzige Voraussetzung zum Kompilieren der Anwendung ist, dass [Qt](http://www.qt.io/download-open-source/) auf Ihrem System installiert ist. Die Desktop-Anwendung wird mit **Qt 5.15** kompiliert. +Die einzige Voraussetzung zum Kompilieren der Anwendung ist, dass [Qt](http://www.qt.io/download-open-source/) auf Ihrem System installiert ist. Die Desktop-Anwendung wird mit **Qt 6.2.2** kompiliert. Auf GNU / Linux-Systemen müssen Sie außerdem `libgl1-mesa-dev` installieren, um die Anwendung zu kompilieren. @@ -41,6 +41,7 @@ Vollständige Liste der verwendeten Qt-Module: - Qt Print Support - Qt Quick Widgets - Qt Quick Controls 2 +- Qt5 Compatibility Module #### Klonen diff --git a/doc/README_ES.md b/doc/README_ES.md index 6a904a55..07848889 100644 --- a/doc/README_ES.md +++ b/doc/README_ES.md @@ -51,7 +51,7 @@ Este proyecto se publica bajo la licencia MIT, para obtener más información, c #### Requisitos -El único requisito para compilar la aplicación es tener [Qt](http://www.qt.io/download-open-source/) instalado en su sistema. La aplicación se compilará con **Qt 5.15**. +El único requisito para compilar la aplicación es tener [Qt](http://www.qt.io/download-open-source/) instalado en su sistema. La aplicación se compilará con **Qt 6.2.2**. En sistemas GNU/Linux, también necesitará instalar `libgl1-mesa-dev` para compilar la aplicación. @@ -65,6 +65,7 @@ Lista completa de módulos Qt usados: - Qt Print Support - Qt Quick Widgets - Qt Quick Controls 2 +- Qt5 Compatibility Module #### Clonado diff --git a/doc/README_ZH.md b/doc/README_ZH.md index 80e6c3ad..59d81d8b 100644 --- a/doc/README_ZH.md +++ b/doc/README_ZH.md @@ -27,7 +27,7 @@ Serial Studio是一个多平台，多用途的串行数据可视化的应用软 #### 要求 -编译本项目的唯一要求是在你的电脑系统中安装 QT ， 本项目编译支持 **Qt 5.15***。 +编译本项目的唯一要求是在你的电脑系统中安装 QT ， 本项目编译支持 **Qt 6.2.2***。 在GNU/Linux系统上，还需要安装`libgl1-mesa-dev`才能编译应用程序。 @@ -41,6 +41,7 @@ Serial Studio是一个多平台，多用途的串行数据可视化的应用软 - Qt Print Support - Qt Quick Widgets - Qt Quick Controls 2 +- Qt5 Compatibility Module #### 克隆 diff --git a/libs/qtcsv b/libs/qtcsv index 5c904568..bfd4a908 160000 --- a/libs/qtcsv +++ b/libs/qtcsv @@ -1 +1 @@ -Subproject commit 5c904568cbede6efe34991c4e652e36f0c8a9c2b +Subproject commit bfd4a908dc4cc3f92dda031bbd3572e653019483 diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD index b07bec6f..d6c8bfbc 100644 --- a/msys2/PKGBUILD +++ b/msys2/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="Serial Studio: Multi-purpose serial data visualization & processing pro arch=('any') url="https://github.com/Serial-Studio/Serial-Studio" license=('MIT') -depends=("${MINGW_PACKAGE_PREFIX}-qt5") +depends=("${MINGW_PACKAGE_PREFIX}-qt6") makedepends=( "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake"