upgraded to Qt v6.7.0

Upgraded workflows, documentation, and also all occurences I found.
This commit is contained in:
silverqx
2024-04-08 15:52:28 +02:00
parent 2f08775c06
commit 24b02b95ba
14 changed files with 63 additions and 63 deletions

View File

@@ -1,4 +1,4 @@
name: Clang-Tidy and Clazy Qt5.15/6.5
name: Clang-Tidy and Clazy Qt5.15/6.7
on:
push:
@@ -23,7 +23,7 @@ jobs:
- key: qt6
name: Qt6
version: 6.5.3
version: 6.7.0
env:
TINY_CLANG_TIDY_COMPLETED: false

View File

@@ -11,7 +11,7 @@
# side, so the the server host name is matched against the CN (Common Name)
# stored in the server certificate.
name: Clang-cl MSVC2022 Qt6.5
name: Clang-cl MSVC2022 Qt6.7
on:
push:
@@ -419,21 +419,21 @@ jobs:
postgres.exe --version
Write-Output '::endgroup::'
- name: Qt 6.5.3 install base components
- name: Qt 6.7.0 install base components
uses: jurplel/install-qt-action@v3
with:
archives: qtbase
version: 6.5.3
version: 6.7.0
arch: win64_msvc2019_64
cache: true
setup-python: false
extra: --external 7z.exe
dir: ${{ env.TinyRunnerWorkPath }}
- name: QMYSQL driver dlls initialize download (Qt 6.5.3)
- name: QMYSQL driver dlls initialize download (Qt 6.7.0)
id: downloads-initialize-qmysql-dlls
run: |
$filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_5_3 -Leaf)
$filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 -Leaf)
"Filename=$filename" >> $env:GITHUB_OUTPUT
$filepath = Join-Path -Path ${{ runner.temp }} -ChildPath $filename
@@ -442,7 +442,7 @@ jobs:
$response = Invoke-WebRequest -Uri $env:URL_CACHE_HASH_WINDOWS
"Hash=$($response.Content)" >> $env:GITHUB_OUTPUT
env:
URL_QMYSQL_DLLS_MSVC_X64_6_5_3: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_5_3 }}
URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }}
URL_CACHE_HASH_WINDOWS: ${{ secrets.URL_CACHE_HASH_WINDOWS }}
- name: QMYSQL driver dlls restore cache (download)
@@ -456,18 +456,18 @@ jobs:
cache_hash: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Hash }}
cache_name: qmysql-dlls-qt6
- name: QMYSQL driver dlls download (Qt 6.5.3)
- name: QMYSQL driver dlls download (Qt 6.7.0)
if: steps.downloads-cache-qmysql-dlls.outputs.cache-hit != 'true'
run: >-
$response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_5_3
$response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0
$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_5_3: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_5_3 }}
URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }}
- name: QMYSQL driver dlls install (Qt 6.5.3)
- name: QMYSQL driver dlls install (Qt 6.7.0)
working-directory: ${{ runner.temp }}
run: |
7z.exe x -y -o"$env:QT_PLUGIN_PATH/sqldrivers" $env:archive_filepath

View File

@@ -12,7 +12,7 @@
# on the libpq client side, so the the server host name is matched against the CN (Common Name)
# stored in the server certificate.
name: MSVC2022 Qt6.5
name: MSVC2022 Qt6.7
on:
push:
@@ -432,21 +432,21 @@ jobs:
postgres.exe --version
Write-Output '::endgroup::'
- name: Qt 6.5.3 install base components
- name: Qt 6.7.0 install base components
uses: jurplel/install-qt-action@v3
with:
archives: qtbase
version: 6.5.3
version: 6.7.0
arch: win64_msvc2019_64
cache: true
setup-python: false
extra: --external 7z.exe
dir: ${{ env.TinyRunnerWorkPath }}
- name: QMYSQL driver dlls initialize download (Qt 6.5.3)
- name: QMYSQL driver dlls initialize download (Qt 6.7.0)
id: downloads-initialize-qmysql-dlls
run: |
$filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_5_3 -Leaf)
$filename = (Split-Path -Path $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0 -Leaf)
"Filename=$filename" >> $env:GITHUB_OUTPUT
$filepath = Join-Path -Path ${{ runner.temp }} -ChildPath $filename
@@ -455,7 +455,7 @@ jobs:
$response = Invoke-WebRequest -Uri $env:URL_CACHE_HASH_WINDOWS
"Hash=$($response.Content)" >> $env:GITHUB_OUTPUT
env:
URL_QMYSQL_DLLS_MSVC_X64_6_5_3: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_5_3 }}
URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }}
URL_CACHE_HASH_WINDOWS: ${{ secrets.URL_CACHE_HASH_WINDOWS }}
- name: QMYSQL driver dlls restore cache (download)
@@ -469,18 +469,18 @@ jobs:
cache_hash: ${{ steps.downloads-initialize-qmysql-dlls.outputs.Hash }}
cache_name: qmysql-dlls-qt6
- name: QMYSQL driver dlls download (Qt 6.5.3)
- name: QMYSQL driver dlls download (Qt 6.7.0)
if: steps.downloads-cache-qmysql-dlls.outputs.cache-hit != 'true'
run: >-
$response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_5_3
$response = Invoke-WebRequest -Uri $env:URL_QMYSQL_DLLS_MSVC_X64_6_7_0
$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_5_3: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_5_3 }}
URL_QMYSQL_DLLS_MSVC_X64_6_7_0: ${{ secrets.URL_QMYSQL_DLLS_MSVC_X64_6_7_0 }}
- name: QMYSQL driver dlls install (Qt 6.5.3)
- name: QMYSQL driver dlls install (Qt 6.7.0)
run: |
7z.exe x -y -o"$env:QT_PLUGIN_PATH/sqldrivers" $env:archive_filepath
env:

View File

@@ -40,7 +40,7 @@ jobs:
- key: qt6
name: Qt6
version: 6.5.3
version: 6.7.0
apt: [qt6-base-dev, libqt6sql6-sqlite]
vcpkg-qt: qtbase
vcpkg-qt-features: qtbase[core,sql-sqlite]

View File

@@ -40,7 +40,7 @@ jobs:
- key: qt6
name: Qt6
version: 6.5.3
version: 6.7.0
vcpkg-qt: qtbase
vcpkg-qt-features: qtbase[core,sql-sqlite]
vcpkg-tinyorm: tinyorm

View File

@@ -489,7 +489,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.5.3
- build the QMYSQL driver - qtbuild-qmysql-driver.ps1 6.7.0
- open the QtCreator
- fix all the Settings - Kits - Kits Qt versions
- fix the Settings - Debugger - Source Paths Mapping
@@ -504,7 +504,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.5.3
- commit - upgraded to Qt v6.7.0
- update the URL_QMYSQL_DLLS_MSVC_X64_x_y_z GitHub secret
MySQL Timezone tables:
@@ -603,13 +603,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.3.2 install base components (jurplel/install-qt-action@v3)
- QMYSQL install driver dlls (Qt 6.3.2) - needed to rebuild the QSQL QMYSQL driver
- 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
- linux-qtX.yml
- add-apt-repository Clang 15
- msvc-2022.yml
- Qt 6.3.2 install base components (jurplel/install-qt-action@v3)
- QMYSQL install driver dlls (Qt 6.3.2) - needed to rebuild the QSQL QMYSQL driver
- 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
- how to update the clazy-standalone (analyzers.yml):
- update the QtCreator to latest version, copy libexec/qtcreator/clang/ to some empty folder
@@ -1231,7 +1231,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.36.5.0 Debug (requested 0.36.5) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_5_3_MSVC2022_64bit-Debug/TinyOrmConfig.cmake
Found package TinyOrm 0.36.5.0 Debug (requested 0.36.5) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug/TinyOrmConfig.cmake
- whether Matching build type for Build tree was enabled/disabled eg.:
Matching build type for the TinyOrm 0.36.5.0 package build tree was enabled

View File

@@ -1,12 +1,12 @@
<h1><img src="https://github.com/silverqx/TinyORM/blob/main/resources/icons/logo-optim.svg" width="34" height="34" alt="TinyORM Logo" align="center">&nbsp;TinyORM</h1>
[![MSVC2019 Qt5.15][action-msvc2019-qt5-badge]][action-msvc2019-qt5]
[![MSVC2022 Qt6.3][action-msvc2022-qt6-badge]][action-msvc2022-qt6]
[![MSVC2022 Qt6.7][action-msvc2022-qt6-badge]][action-msvc2022-qt6]
[![Linux GCC/Clang Qt5.15][action-linux-badge-qt5]][action-linux-qt5]
[![Linux GCC/Clang Qt6.2][action-linux-badge-qt6]][action-linux-qt6]
[![MSYS2 UCRT64 GCC/Clang][action-mingw-badge]][action-mingw]
[![clang-cl MSVC2022][action-clang-cl-badge]][action-clang-cl]
[![Clang-Tidy/Clazy Qt5.15/6.5][action-analyzers-qt5-qt6-badge]][action-analyzers-qt5-qt6]
[![Clang-Tidy/Clazy Qt5.15/6.7][action-analyzers-qt5-qt6-badge]][action-analyzers-qt5-qt6]
[![Vcpkg Windows][action-vcpkg-windows-badge]][action-vcpkg-windows]
[![Vcpkg Linux][action-vcpkg-linux-badge]][action-vcpkg-linux]

View File

@@ -544,7 +544,7 @@ Then, create a <code>.env.(win32&vert;unix&vert;mingw)</code> 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_5_3_MSVC2022_64bit-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2022_64bit-Debug/)
# Path to the vcpkg - range-v3
# Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty
@@ -563,7 +563,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_5_3_clang16_64bit_ccache-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_clang16_64bit_ccache-Debug/)
# Path to the vcpkg - range-v3
# Will use the TINY_VCPKG_ROOT or VCPKG_ROOT environment variable if is empty
@@ -586,7 +586,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_5_3_MSYS2_UCRT64_clang_64bit-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_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

View File

@@ -686,7 +686,7 @@ Then, create a <code>.env.(win32&vert;unix&vert;mingw)</code> 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_5_3_MSVC2022_64bit-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_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
@@ -705,7 +705,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_5_3_clang16_64bit_ccache-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_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
@@ -728,7 +728,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_5_3_MSYS2_UCRT64_clang_64bit-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_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

View File

@@ -78,8 +78,8 @@ Here is one simple example for `pwsh`.
<TabItem value='qtenv6.ps1' label='qtenv6.ps1'>
```powershell
Write-Host 'Setting up environment for Qt 6.5.3 usage...' -ForegroundColor Magenta
$env:Path = 'C:\Qt\6.5.3\msvc2019_64\bin;' + $env:Path
Write-Host 'Setting up environment for Qt 6.7.0 usage...' -ForegroundColor Magenta
$env:Path = 'C:\Qt\6.7.0\msvc2019_64\bin;' + $env:Path
. E:\dotfiles\bin\vcvars64.ps1
```
@@ -102,10 +102,10 @@ And here for `Linux`.
<TabItem value='qtenv6' label='qtenv6'>
```bash
echo 'Setting up environment for Qt 6.5.3 usage...'
echo 'Setting up environment for Qt 6.7.0 usage...'
export PATH=/opt/Qt/6.5.3/gcc_64/bin${PATH:+:}$PATH
export LD_LIBRARY_PATH=/opt/Qt/6.5.3/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
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
```
</TabItem>
@@ -171,10 +171,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_5_3_MSVC2019_64bit-Debug/
│ │ └── build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/
│ └── tom-builds-qmake/
│ ├── build-TinyORM-Desktop_Qt_5_15_3_MSYS2_UCRT64_64bit-Release/
│ └── build-TinyORM-Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/
│ └── build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/
├── tmp/
└── vcpkg/
```
@@ -217,10 +217,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_5_3_clang14_64bit_ccache-Debug/
│ │ └── build-TinyORM-Desktop_Qt_6_7_0_clang14_64bit_ccache-Debug/
│ └── tom-builds-qmake/
│ ├── build-TinyORM-Desktop_Qt_6_5_3_GCC_64bit-Debug/
│ └── build-TinyORM-Desktop_Qt_6_5_3_clang14_64bit_ccache-Release/
│ ├── build-TinyORM-Desktop_Qt_6_7_0_GCC_64bit-Debug/
│ └── build-TinyORM-Desktop_Qt_6_7_0_clang14_64bit_ccache-Release/
├── tmp/
└── vcpkg/
```
@@ -250,7 +250,7 @@ Prepare compilation environment, we need to put the Qt Framework and Visual Stud
<CodeBlock className='language-powershell'>
{`mkdir ${rootFolderPath(pwsh)}
cd ${rootFolderPath(pwsh)}
$env:Path = 'C:\\Qt\\6.5.3\\msvc2019_64\\bin;' + $env:Path
$env:Path = 'C:\\Qt\\6.7.0\\msvc2019_64\\bin;' + $env:Path
vcvars64.ps1`}
</CodeBlock>
</TabItem>
@@ -258,8 +258,8 @@ vcvars64.ps1`}
<CodeBlock className='language-bash'>
{`mkdir -p ${rootFolderPath(bash)}
cd ${rootFolderPath(bash)}
export PATH=/opt/Qt/6.5.3/gcc_64/bin$\{PATH:+:\}$PATH
export LD_LIBRARY_PATH=/opt/Qt/6.5.3/gcc_64/lib$\{LD_LIBRARY_PATH:+:\}$LD_LIBRARY_PATH`}
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`}
</CodeBlock>
</TabItem>
</Tabs>
@@ -826,7 +826,7 @@ TINY_MAIN_DIR = $$clean_path(<your_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_5_3_MSVC2019_64bit-Debug/)
TINYORM_BUILD_TREE = $$quote($$TINY_MAIN_DIR/TinyORM-builds-qmake/build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/)
# vcpkg - range-v3 and tabulate
TINY_VCPKG_ROOT = $$quote(<your_path>/vcpkg/)
#TINY_VCPKG_TRIPLET = x64-windows
@@ -860,7 +860,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 <small>(/debug, /release, or an empty string)</small>. |
| `TINY_CCACHE_BUILD` | To correctly link `ccache` build against a `ccache` build <small>(_ccache or an empty string)</small>. |
| `TINY_MSVC_VERSION` | The `msvc` compiler string <small>(MSVC2022 or MSVC2019)</small>. |
| `TINY_QT_VERSION_UNDERSCORED` | Underscored `Qt` version <small>(eg. 6_5_3)</small>. |
| `TINY_QT_VERSION_UNDERSCORED` | Underscored `Qt` version <small>(eg. 6_7_0)</small>. |
| `TINY_RELEASE_TYPE_CAMEL` | Build type string <small>(Debug, Profile, or Release)</small>. |
| `TINY_VCPKG_INCLUDE` | Path to the `vcpkg` `include` folder <small>(vcpkg/installed/&lt;triplet&gt;/include/)</small>. |
@@ -891,7 +891,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_5_3_MSVC2019_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/)
LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_0_MSVC2019_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/)
LIBS += -lTinyOrm
```
@@ -908,7 +908,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_5_3_GCC_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/)
LIBS += $$quote(-L$$TINYORM_BUILD_TREE/build-TinyORM-Desktop_Qt_6_7_0_GCC_64bit-Debug/src$${TINY_BUILD_SUBFOLDER}/)
LIBS += -lTinyOrm
```
@@ -1041,7 +1041,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_5_3_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_5_3_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_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`.
:::caution
This will only work if you follow the recommended [`Folders structure`](#folders-structure).

View File

@@ -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_5_2).
# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_0).
# - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release).
# - TINY_VCPKG_INCLUDE - Path to the vcpkg include folder (vcpkg/installed/<triplet>/include/).
#

View File

@@ -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_5_2)
# Underscored Qt version (eg. 6_7_0)
TINY_QT_VERSION_UNDERSCORED = $$replace(QT_VERSION, \., _)
# Build type string (Debug, Profile, or Release)

View File

@@ -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_5_2).
# - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_7_0).
# - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release).
# - TINY_VCPKG_INCLUDE - Path to the vcpkg include folder (vcpkg/installed/<triplet>/include/).
#

View File

@@ -249,17 +249,17 @@ AboutCommand::printAboutItemsDetail(const std::map<QString, AboutValue> &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.6.2", "range-v3": "0.12.0", "tinydrivers": "0.1.0"}
"dependencies": {"qt": "6.7.0", "range-v3": "0.12.0", "tinydrivers": "0.1.0"}
With the Dependencies' components it would look like:
"dependencies": {
"qt": {
"version": "6.6.2",
"version": "6.7.0",
"components": ["Core"]
},
"range-v3": "0.12.0",
"tinydrivers": : {
"version": "6.6.2",
"version": "6.7.0",
"components": ["MySQL"]
}
}