From d970f13cb50d23f5b251341102365527ca997a77 Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 24 May 2024 21:45:42 +0200 Subject: [PATCH] upgraded to Qt v6.7.1 - docs - tools - workflows - NOTES.txt --- .github/workflows/analyzers.yml | 2 +- .github/workflows/clang-cl-qt6.yml | 18 +++++------ .github/workflows/linux-qt6-drivers.yml | 8 ++--- .github/workflows/msvc2022-qt6-drivers.yml | 2 +- .github/workflows/msvc2022-qt6.yml | 18 +++++------ .github/workflows/vcpkg-linux-drivers.yml | 2 +- .github/workflows/vcpkg-linux.yml | 2 +- .github/workflows/vcpkg-windows-drivers.yml | 2 +- .github/workflows/vcpkg-windows.yml | 2 +- NOTES.txt | 29 +++++++++++------ docs/building/hello-world.mdx | 6 ++-- docs/building/migrations.mdx | 6 ++-- docs/building/tinyorm.mdx | 36 ++++++++++----------- qmake/TinyOrm.pri | 2 +- qmake/support/variables.pri | 2 +- qmake/tom.pri | 2 +- tom/src/tom/commands/aboutcommand.cpp | 6 ++-- tools/qsdb-deploy.ps1.example | 2 +- tools/qtenv6.ps1.example | 4 +-- tools/stdm6.ps1.example | 2 +- tools/stpm6.ps1.example | 2 +- tools/strm6.ps1.example | 2 +- 22 files changed, 83 insertions(+), 74 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 2912e121f..1283158d4 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -32,7 +32,7 @@ jobs: - key: qt6 name: Qt6 - version: 6.7.0 + version: 6.7.1 env: TINY_CLANG_TIDY_COMPLETED: false diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml index 8d265b83f..cc2e41c13 100644 --- a/.github/workflows/clang-cl-qt6.yml +++ b/.github/workflows/clang-cl-qt6.yml @@ -423,21 +423,21 @@ jobs: postgres.exe --version Write-Output '::endgroup::' - - name: Qt 6.7.0 install base components + - name: Qt 6.7.1 install base components uses: jurplel/install-qt-action@v3 with: archives: qtbase - version: 6.7.0 + version: 6.7.1 arch: win64_msvc2019_64 cache: true setup-python: false extra: --external 7z.exe dir: ${{ env.TinyRunnerWorkPath }} - - name: QMYSQL driver dlls initialize download (Qt 6.7.0) + - name: QMYSQL driver dlls initialize download (Qt 6.7.1) id: downloads-initialize-qmysql-dlls run: | - $filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 -Leaf) + $filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_1 -Leaf) "Filename=$filename" >> $env:GITHUB_OUTPUT $filepath = Join-Path -Path ${{ runner.temp }} -ChildPath $filename @@ -446,7 +446,7 @@ jobs: $response = Invoke-WebRequest -Uri $env:URL_CACHE_HASH_WINDOWS "Hash=$($response.Content)" >> $env:GITHUB_OUTPUT env: - URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }} + URL_QMYSQL_DLLS_MSVC_X64_6_7_1: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_1 }} URL_CACHE_HASH_WINDOWS: ${{ secrets.URL_CACHE_HASH_WINDOWS }} - name: QMYSQL driver dlls restore cache (download) @@ -460,18 +460,18 @@ jobs: cache_hash: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Hash }} cache_name: qmysql-dlls-qt6 - - name: QMYSQL driver dlls download (Qt 6.7.0) + - name: QMYSQL driver dlls download (Qt 6.7.1) if: steps.downloads-cache-qmysql-dlls.outputs.cache-hit != 'true' run: >- - $response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 + $response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_1 $response | Select-Object -ExpandProperty Content | Set-Content -Path $env:archive_filepath -AsByteStream env: archive_filepath: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Filepath }} - URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }} + URL_QMYSQL_DLLS_MSVC_X64_6_7_1: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_1 }} - - name: QMYSQL driver dlls install (Qt 6.7.0) + - name: QMYSQL driver dlls install (Qt 6.7.1) working-directory: ${{ runner.temp }} run: | 7z.exe x -y -o"$env:QT_PLUGIN_PATH/sqldrivers" $env:archive_filepath diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml index e61aaa378..fedbbdf42 100644 --- a/.github/workflows/linux-qt6-drivers.yml +++ b/.github/workflows/linux-qt6-drivers.yml @@ -168,15 +168,15 @@ jobs: run: | vcpkg --version - - name: Qt v6.7.0 prepare environment + - name: Qt v6.7.1 prepare environment run: | - echo '/opt/Qt/6.7.0/bin' >> $GITHUB_PATH - echo "LD_LIBRARY_PATH=/opt/Qt/6.7.0/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo '/opt/Qt/6.7.1/bin' >> $GITHUB_PATH + echo "LD_LIBRARY_PATH=/opt/Qt/6.7.1/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV # The CMAKE_PREFIX_PATH must be defined on the GitHub Actions, this is some kind of a bug # because the CMake can't find the Qt, but if I export the PATH directly in the step # it works but doesn't work using the GITHUB_PATH like define two line above. 🫤 - echo "CMAKE_PREFIX_PATH=/opt/Qt/6.7.0/gcc_64${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV + echo "CMAKE_PREFIX_PATH=/opt/Qt/6.7.1/gcc_64${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV - name: CMake print version run: | diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml index 9a4c9e552..7f241f101 100644 --- a/.github/workflows/msvc2022-qt6-drivers.yml +++ b/.github/workflows/msvc2022-qt6-drivers.yml @@ -148,7 +148,7 @@ jobs: run: | 'C:\Program Files\CMake\bin' >> $env:GITHUB_PATH "$env:VCPKG_INSTALLATION_ROOT" >> $env:GITHUB_PATH - "$env:TINY_QT_ROOT\6.7.0\msvc2019_64\bin" >> $env:GITHUB_PATH + "$env:TINY_QT_ROOT\6.7.1\msvc2019_64\bin" >> $env:GITHUB_PATH # Must be after the ilammy/msvc-dev-cmd@v1 because vcvars64 overrides the VCPKG_ROOT - name: vcpkg prepare environment diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml index 13016fa4b..0e180d74e 100644 --- a/.github/workflows/msvc2022-qt6.yml +++ b/.github/workflows/msvc2022-qt6.yml @@ -436,21 +436,21 @@ jobs: postgres.exe --version Write-Output '::endgroup::' - - name: Qt 6.7.0 install base components + - name: Qt 6.7.1 install base components uses: jurplel/install-qt-action@v3 with: archives: qtbase - version: 6.7.0 + version: 6.7.1 arch: win64_msvc2019_64 cache: true setup-python: false extra: --external 7z.exe dir: ${{ env.TinyRunnerWorkPath }} - - name: QMYSQL driver dlls initialize download (Qt 6.7.0) + - name: QMYSQL driver dlls initialize download (Qt 6.7.1) id: downloads-initialize-qmysql-dlls run: | - $filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 -Leaf) + $filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_1 -Leaf) "Filename=$filename" >> $env:GITHUB_OUTPUT $filepath = Join-Path -Path ${{ runner.temp }} -ChildPath $filename @@ -459,7 +459,7 @@ jobs: $response = Invoke-WebRequest -Uri $env:URL_CACHE_HASH_WINDOWS "Hash=$($response.Content)" >> $env:GITHUB_OUTPUT env: - URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }} + URL_QMYSQL_DLLS_MSVC_X64_6_7_1: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_1 }} URL_CACHE_HASH_WINDOWS: ${{ secrets.URL_CACHE_HASH_WINDOWS }} - name: QMYSQL driver dlls restore cache (download) @@ -473,18 +473,18 @@ jobs: cache_hash: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Hash }} cache_name: qmysql-dlls-qt6 - - name: QMYSQL driver dlls download (Qt 6.7.0) + - name: QMYSQL driver dlls download (Qt 6.7.1) if: steps.downloads-cache-qmysql-dlls.outputs.cache-hit != 'true' run: >- - $response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 + $response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_1 $response | Select-Object -ExpandProperty Content | Set-Content -Path $env:archive_filepath -AsByteStream env: archive_filepath: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Filepath }} - URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }} + URL_QMYSQL_DLLS_MSVC_X64_6_7_1: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_1 }} - - name: QMYSQL driver dlls install (Qt 6.7.0) + - name: QMYSQL driver dlls install (Qt 6.7.1) run: | 7z.exe x -y -o"$env:QT_PLUGIN_PATH/sqldrivers" $env:archive_filepath env: diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml index 714941b6a..3ddd14338 100644 --- a/.github/workflows/vcpkg-linux-drivers.yml +++ b/.github/workflows/vcpkg-linux-drivers.yml @@ -42,7 +42,7 @@ jobs: qt: - key: qt6 name: Qt6 - version: 6.7.0 + version: 6.7.1 # For vcpkg classic mode (install tests) vcpkg-qt: qtbase vcpkg-qt-features: qtbase[core] diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml index 4e9fd895f..9fe4e916e 100644 --- a/.github/workflows/vcpkg-linux.yml +++ b/.github/workflows/vcpkg-linux.yml @@ -52,7 +52,7 @@ jobs: - key: qt6 name: Qt6 - version: 6.7.0 + version: 6.7.1 apt: [ qt6-base-dev, libqt6sql6-sqlite ] # For vcpkg classic mode (install tests) vcpkg-qt: qtbase diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml index a40386866..fc7545da0 100644 --- a/.github/workflows/vcpkg-windows-drivers.yml +++ b/.github/workflows/vcpkg-windows-drivers.yml @@ -32,7 +32,7 @@ jobs: qt: - key: qt6 name: Qt6 - version: 6.7.0 + version: 6.7.1 # For vcpkg classic mode (install tests) vcpkg-qt: qtbase vcpkg-qt-features: qtbase[core] diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml index f7cf5b385..54af14129 100644 --- a/.github/workflows/vcpkg-windows.yml +++ b/.github/workflows/vcpkg-windows.yml @@ -42,7 +42,7 @@ jobs: - key: qt6 name: Qt6 - version: 6.7.0 + version: 6.7.1 # For vcpkg classic mode (install tests) vcpkg-qt: qtbase vcpkg-qt-features: qtbase[core,sql-sqlite] diff --git a/NOTES.txt b/NOTES.txt index 7bb749df3..4ea2822c8 100644 --- a/NOTES.txt +++ b/NOTES.txt @@ -512,7 +512,7 @@ Upgrade the Qt to new version: - remove the old C:\Qt\x.y.z version folder (leftovers) - open dotfiles in the vscode and file/replace all occurences of x.y.z and x_y_z to the new version; commit - upgraded to Qt vx.y.z - add a new Qt version on the user PATH environment variable - - build the QMYSQL driver - qtbuild-qmysql-driver.ps1 6.7.0 + - build the QMYSQL driver - qtbuild-qmysql-driver.ps1 6.7.1 - open the QtCreator - fix all the Settings - Kits - Kits Qt versions - fix the Settings - Debugger - Source Paths Mapping @@ -527,7 +527,7 @@ GitHub Action workflows: - 7zip the qsqlmysql.dll, qsqlmysql.pdb, qsqlmysqld.dll, qsqlmysqld.pdb to the TinyOrm-files/qmysql_dlls-x.y.z.7z - remove the old TinyOrm-files/qmysql_dlls-x.y.z.7z file - generate the new hash - .\tools\Get-DownloadsHash.ps1 -Platform Linux, Windows - - commit - upgraded to Qt v6.7.0 + - commit - upgraded to Qt v6.7.1 - update the URL_QMYSQL_DLLS_MSVC_X64_x_y_z GitHub secret MySQL Timezone tables: @@ -645,13 +645,13 @@ GitHub Actions: - add-apt-repository Clang 14 - clang-cl-qt6.yml - Install LLVM and Clang 15.0.6 (KyleMayes/install-llvm-action@v1) - - Qt 6.7.0 install base components (jurplel/install-qt-action@v3) - - QMYSQL install driver dlls (Qt 6.7.0) - needed to rebuild the QSQL QMYSQL driver + - Qt 6.7.1 install base components (jurplel/install-qt-action@v3) + - QMYSQL install driver dlls (Qt 6.7.1) - needed to rebuild the QSQL QMYSQL driver - linux-qtX.yml - add-apt-repository Clang 15 - msvc-2022.yml - - Qt 6.7.0 install base components (jurplel/install-qt-action@v3) - - QMYSQL install driver dlls (Qt 6.7.0) - needed to rebuild the QSQL QMYSQL driver + - Qt 6.7.1 install base components (jurplel/install-qt-action@v3) + - QMYSQL install driver dlls (Qt 6.7.1) - needed to rebuild the QSQL QMYSQL driver - how to update the clazy-standalone (analyzers.yml): - update the QtCreator to latest version, copy libexec/qtcreator/clang/ to some empty folder @@ -1301,7 +1301,7 @@ How the Package Config file works: - I have invested a lot of effort to these info messages - whether linking against the single, multi, vcpkg builds - against which TinyORM package is linking eg.: - Found package TinyOrm 0.37.3.0 Debug (requested 0.37.3) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug/TinyOrmConfig.cmake + Found package TinyOrm 0.37.3.0 Debug (requested 0.37.3) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug/TinyOrmConfig.cmake - whether Matching build type for Build tree was enabled/disabled eg.: Matching build type for the TinyOrm 0.37.3.0 package build tree was enabled @@ -3091,12 +3091,21 @@ pip install --upgrade aqtinstall - removing old Qt v6.5.3 sudo rm -rf /opt/Qt/6.5.3 - - install Qt v6.7.0 + - install Qt v6.7.1 aqt list-qt linux desktop -aqt list-qt linux desktop --arch 6.7.0 -aqt install-qt --external 7z --outputdir /opt/Qt linux desktop 6.7.0 linux_gcc_64 +aqt list-qt linux desktop --arch 6.7.1 +aqt install-qt --external 7z --outputdir /opt/Qt linux desktop 6.7.1 linux_gcc_64 - Qt Maintenance Tool: + - don't call ./MaintenanceTool update as it installs QtCreator + +to update Qt run eg. 6.7.0 -> 6.7.1 call: +./MaintenanceTool --type package --filter-packages "DisplayName=Desktop" search qt.qt6.671.linux_gcc_64 +./MaintenanceTool install qt.qt6.671.linux_gcc_64 +./MaintenanceTool --mirror https://qt-mirror.dannhauer.de install qt.qt6.671.linux_gcc_64 +./MaintenanceTool remove qt.qt6.670.linux_gcc_64 +no env or PATH-s upgrade is needed +what is needed is to replace all 6.7.0 -> 6.7.1 in GitHub workflow yml files initial installation of Qt base FW only (w/o user input): ./qt-unified-linux-x64-4.7.0-online.run --root /opt/Qt --email 'silver.zachara@gmail.com' --password '' --accept-licenses --default-answer --confirm-command install qt.qt6.670.linux_gcc_64 diff --git a/docs/building/hello-world.mdx b/docs/building/hello-world.mdx index 36d7ccbb1..e8bb6f65e 100644 --- a/docs/building/hello-world.mdx +++ b/docs/building/hello-world.mdx @@ -545,7 +545,7 @@ Then, create a .env.(win32|unix|mingw) file in the `Hello # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug/) # Path to the vcpkg - range-v3 # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty @@ -564,7 +564,7 @@ TINY_VCPKG_TRIPLET = x64-windows # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_clang16_64bit_ccache-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_clang16_64bit_ccache-Debug/) # Path to the vcpkg - range-v3 # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty @@ -587,7 +587,7 @@ else: CONFIG *= use_gold_linker # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSYS2_UCRT64_clang_64bit-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSYS2_UCRT64_clang_64bit-Debug/) # Path to the vcpkg - range-v3 # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty diff --git a/docs/building/migrations.mdx b/docs/building/migrations.mdx index 33446a0ac..e68cfba23 100644 --- a/docs/building/migrations.mdx +++ b/docs/building/migrations.mdx @@ -690,7 +690,7 @@ Then, create a .env.(win32|unix|mingw) file in the `tom` # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug/) # Path to the vcpkg - range-v3 and tabulate # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty @@ -709,7 +709,7 @@ TINY_VCPKG_TRIPLET = x64-windows # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_clang16_64bit_ccache-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_clang16_64bit_ccache-Debug/) # Path to the vcpkg - range-v3 and tabulate # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty @@ -732,7 +732,7 @@ else: CONFIG *= use_gold_linker # Please pay special attention to letter casing in paths, especially TinyOrm vs TinyORM! # Path to the TinyORM build folder -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSYS2_UCRT64_clang_64bit-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSYS2_UCRT64_clang_64bit-Debug/) # Path to the vcpkg - range-v3 and tabulate # Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty diff --git a/docs/building/tinyorm.mdx b/docs/building/tinyorm.mdx index c42866463..e6c8d9892 100644 --- a/docs/building/tinyorm.mdx +++ b/docs/building/tinyorm.mdx @@ -84,12 +84,12 @@ Here is one simple example for `pwsh`. Set-StrictMode -Version 3.0 -Write-Host 'Setting up environment for Qt 6.7.0 usage...' -ForegroundColor Magenta +Write-Host 'Setting up environment for Qt 6.7.1 usage...' -ForegroundColor Magenta Write-Host $Script:QtRoot = $env:TINY_QT_ROOT ?? 'C:\Qt' -$env:Path = "$Script:QtRoot\6.7.0\msvc2019_64\bin;" + $env:Path +$env:Path = "$Script:QtRoot\6.7.1\msvc2019_64\bin;" + $env:Path . vcvars64.ps1 ``` @@ -124,12 +124,12 @@ And here for `Linux`. ```bash #!/usr/bin/env sh -echo 'Setting up environment for Qt 6.7.0 usage...' +echo 'Setting up environment for Qt 6.7.1 usage...' QtRoot="${TINY_QT_ROOT:-/opt/Qt}" -export PATH="$QtRoot/6.7.0/gcc_64/bin"${PATH:+:}$PATH -export LD_LIBRARY_PATH="$QtRoot/6.7.0/gcc_64/lib"${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH +export PATH="$QtRoot/6.7.1/gcc_64/bin"${PATH:+:}$PATH +export LD_LIBRARY_PATH="$QtRoot/6.7.1/gcc_64/lib"${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ``` @@ -206,10 +206,10 @@ You can set the root and application folder paths in the form below and they wil │ │ ├── migrations.pri │ │ └── seeders.pri │ ├── tom-builds-cmake/ -│ │ └── build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/ +│ │ └── build-TinyORM-Desktop_Qt_6_7_1_MSVC2019_64bit-Debug/ │ └── tom-builds-qmake/ │ ├── build-TinyORM-Desktop_Qt_5_15_3_MSYS2_UCRT64_64bit-Release/ -│ └── build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/ +│ └── build-TinyORM-Desktop_Qt_6_7_1_MSVC2019_64bit-Debug/ ├── tmp/ └── vcpkg/ ``` @@ -251,10 +251,10 @@ You can set the root and application folder paths in the form below and they wil │ │ ├── migrations.pri │ │ └── seeders.pri │ ├── tom-builds-cmake/ -│ │ └── build-TinyORM-Desktop_Qt_6_7_0_clang14_64bit_ccache-Debug/ +│ │ └── build-TinyORM-Desktop_Qt_6_7_1_clang14_64bit_ccache-Debug/ │ └── tom-builds-qmake/ -│ ├── build-TinyORM-Desktop_Qt_6_7_0_GCC_64bit-Debug/ -│ └── build-TinyORM-Desktop_Qt_6_7_0_clang14_64bit_ccache-Release/ +│ ├── build-TinyORM-Desktop_Qt_6_7_1_GCC_64bit-Debug/ +│ └── build-TinyORM-Desktop_Qt_6_7_1_clang14_64bit_ccache-Release/ ├── tmp/ └── vcpkg/ ``` @@ -284,7 +284,7 @@ Prepare compilation environment, we need to put the Qt Framework and Visual Stud {`mkdir ${rootFolderPath(pwsh)} cd ${rootFolderPath(pwsh)} -$env:Path = 'C:\\Qt\\6.7.0\\msvc2019_64\\bin;' + $env:Path +$env:Path = 'C:\\Qt\\6.7.1\\msvc2019_64\\bin;' + $env:Path vcvars64.ps1`} @@ -292,8 +292,8 @@ vcvars64.ps1`} {`mkdir -p ${rootFolderPath(bash)} cd ${rootFolderPath(bash)} -export PATH=/opt/Qt/6.7.0/gcc_64/bin$\{PATH:+:\}$PATH -export LD_LIBRARY_PATH=/opt/Qt/6.7.0/gcc_64/lib$\{LD_LIBRARY_PATH:+:\}$LD_LIBRARY_PATH`} +export PATH=/opt/Qt/6.7.1/gcc_64/bin$\{PATH:+:\}$PATH +export LD_LIBRARY_PATH=/opt/Qt/6.7.1/gcc_64/lib$\{LD_LIBRARY_PATH:+:\}$LD_LIBRARY_PATH`} @@ -870,7 +870,7 @@ TINY_MAIN_DIR = $$clean_path() TINY_DOTENV_ROOT = $$PWD # Path to the TinyORM build folder (specified manually) -TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/) +TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSVC2019_64bit-Debug/) # vcpkg - range-v3 and tabulate TINY_VCPKG_ROOT = $$quote(/vcpkg/) #TINY_VCPKG_TRIPLET = x64-windows @@ -904,7 +904,7 @@ These variables will be set after the configuration is done: | `TINY_BUILD_SUBFOLDER` | Folder by release type if `CONFIG+=debug_and_release` is defined (/debug, /release, or an empty string). | | `TINY_CCACHE_BUILD` | To correctly link `ccache` build against a `ccache` build (_ccache or an empty string). | | `TINY_MSVC_VERSION` | The `msvc` compiler string (MSVC2022 or MSVC2019). | -| `TINY_QT_VERSION_UNDERSCORED` | Underscored `Qt` version (eg. 6_7_0). | +| `TINY_QT_VERSION_UNDERSCORED` | Underscored `Qt` version (eg. 6_7_1). | | `TINY_RELEASE_TYPE_CAMEL` | Build type string (Debug, Profile, or Release). | | `TINY_VCPKG_INCLUDE` | Path to the `vcpkg` `include` folder (vcpkg/installed/<triplet>/include/). | @@ -935,7 +935,7 @@ include($$TINY_MAIN_DIR/TinyORM/qmake/TinyOrm.pri) # TinyORM library path TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake) -LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/) +LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_1_MSVC2019_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/) LIBS += -lTinyOrm ``` @@ -952,7 +952,7 @@ include($$TINY_MAIN_DIR/TinyORM/qmake/TinyOrm.pri) # TinyORM library path TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake) -LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_0_GCC_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/) +LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_1_GCC_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/) LIBS += -lTinyOrm ``` @@ -1085,7 +1085,7 @@ TINY_BUILD_TREE = $$shadowed($$PWD) If you will follow this pattern or logic then you can switch `QtCreator Kits` and the `TINYORM_BUILD_TREE` will be __auto-generated__ correctly and will always point to the correct `TinyORM` build tree. -It works this way, all is happening inside the `variables.pri`, it takes a build folder name for the __current__ project eg. `build-HelloWorld-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug`, replaces the `HelloWorld` with the `TinyORM` and as we already know the `TinyORM` build folder location we can simply concatenate these paths like `$$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug`. +It works this way, all is happening inside the `variables.pri`, it takes a build folder name for the __current__ project eg. `build-HelloWorld-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug`, replaces the `HelloWorld` with the `TinyORM` and as we already know the `TinyORM` build folder location we can simply concatenate these paths like `$$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug`. :::warning This will only work if you follow the recommended [`Folders structure`](#folders-structure). diff --git a/qmake/TinyOrm.pri b/qmake/TinyOrm.pri index 9b3d77a53..8acd19eac 100644 --- a/qmake/TinyOrm.pri +++ b/qmake/TinyOrm.pri @@ -27,7 +27,7 @@ # - TINY_BUILD_SUBFOLDER - Folder by release type if CONFIG+=debug_and_release is defined (/debug, /release, or an empty string). # - TINY_CCACHE_BUILD - To correctly link ccache build against a ccache build (_ccache or an empty string). # - TINY_MSVC_VERSION - Msvc compiler string (MSVC2022 or MSVC2019). -# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_0). +# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_1). # - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release). # - TINY_VCPKG_INCLUDE - Path to the vcpkg include folder (vcpkg/installed//include/). # diff --git a/qmake/support/variables.pri b/qmake/support/variables.pri index a4de16c39..5f51908b1 100644 --- a/qmake/support/variables.pri +++ b/qmake/support/variables.pri @@ -42,7 +42,7 @@ isEmpty(TINYORM_BUILD_TREE): TINYORM_BUILD_TREE = $$tinyorm_build_tree() # All variables below can also be used to put together a path to the TinyORM build tree # They were used in previous versions a better option is to use the variables above -# Underscored Qt version (eg. 6_7_0) +# Underscored Qt version (eg. 6_7_1) TINY_QT_VERSION_UNDERSCORED = $$replace(QT_VERSION, \., _) # Build type string (Debug, Profile, or Release) diff --git a/qmake/tom.pri b/qmake/tom.pri index 97bd83ec0..d05bf552a 100644 --- a/qmake/tom.pri +++ b/qmake/tom.pri @@ -27,7 +27,7 @@ # - TINY_BUILD_SUBFOLDER - Folder by release type if CONFIG+=debug_and_release is defined (/debug, /release, or an empty string). # - TINY_CCACHE_BUILD - To correctly link ccache build against a ccache build (_ccache or an empty string). # - TINY_MSVC_VERSION - Msvc compiler string (MSVC2022 or MSVC2019). -# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_0). +# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_1). # - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release). # - TINY_VCPKG_INCLUDE - Path to the vcpkg include folder (vcpkg/installed//include/). # diff --git a/tom/src/tom/commands/aboutcommand.cpp b/tom/src/tom/commands/aboutcommand.cpp index bcfeb9159..e41f53833 100644 --- a/tom/src/tom/commands/aboutcommand.cpp +++ b/tom/src/tom/commands/aboutcommand.cpp @@ -249,17 +249,17 @@ AboutCommand::printAboutItemsDetail(const std::map &aboutIt /* I won't serialize the Dependencies components into the JSON output because that would add unnecessary complexity to the consumers' parsing code. Currently the output looks like: -"dependencies": {"qt": "6.7.0", "range-v3": "0.12.0", "tinydrivers": "0.1.1"} +"dependencies": {"qt": "6.7.1", "range-v3": "0.12.0", "tinydrivers": "0.1.1"} With the Dependencies' components it would look like: "dependencies": { "qt": { - "version": "6.7.0", + "version": "6.7.1", "components": ["Core"] }, "range-v3": "0.12.0", "tinydrivers": : { - "version": "6.7.0", + "version": "6.7.1", "components": ["MySQL"] } } diff --git a/tools/qsdb-deploy.ps1.example b/tools/qsdb-deploy.ps1.example index eadfd8b35..c2e108b33 100644 --- a/tools/qsdb-deploy.ps1.example +++ b/tools/qsdb-deploy.ps1.example @@ -3,7 +3,7 @@ Set-StrictMode -Version 3.0 $Script:BuildPath = '\TinyORM\TinyORM-builds-qmake\' + - 'build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Release' + 'build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Release' $Script:DestinationPath = '\dotfiles\bin' $Script:TinyDriversPath = "${Script:BuildPath}\src\release\TinyDrivers0.dll" diff --git a/tools/qtenv6.ps1.example b/tools/qtenv6.ps1.example index b66b5f8f2..a45ca6d28 100644 --- a/tools/qtenv6.ps1.example +++ b/tools/qtenv6.ps1.example @@ -2,11 +2,11 @@ Set-StrictMode -Version 3.0 -Write-Host 'Setting up environment for Qt 6.7.0 usage...' -ForegroundColor Magenta +Write-Host 'Setting up environment for Qt 6.7.1 usage...' -ForegroundColor Magenta Write-Host $Script:QtRoot = $env:TINY_QT_ROOT ?? 'C:\Qt' -$env:Path = "$Script:QtRoot\6.7.0\msvc2019_64\bin;" + $env:Path +$env:Path = "$Script:QtRoot\6.7.1\msvc2019_64\bin;" + $env:Path . vcvars64.ps1 diff --git a/tools/stdm6.ps1.example b/tools/stdm6.ps1.example index 62e50fbe9..e1007fed2 100644 --- a/tools/stdm6.ps1.example +++ b/tools/stdm6.ps1.example @@ -7,4 +7,4 @@ if (-not (Test-Path env:WindowsSDKLibVersion)) { . qtenv6.ps1 } -std.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug' +std.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Debug' diff --git a/tools/stpm6.ps1.example b/tools/stpm6.ps1.example index 81e16c085..e4c64dd65 100644 --- a/tools/stpm6.ps1.example +++ b/tools/stpm6.ps1.example @@ -7,4 +7,4 @@ if (-not (Test-Path env:WindowsSDKLibVersion)) { . qtenv6.ps1 } -str.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Profile' +str.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Profile' diff --git a/tools/strm6.ps1.example b/tools/strm6.ps1.example index 89b363410..7616f300e 100644 --- a/tools/strm6.ps1.example +++ b/tools/strm6.ps1.example @@ -7,4 +7,4 @@ if (-not (Test-Path env:WindowsSDKLibVersion)) { . qtenv6.ps1 } -str.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Release' +str.ps1 -BuildPath '\TinyORM\TinyORM-builds-qmake\build-TinyORM-Desktop_Qt_6_7_1_MSVC2022_64bit-Release'