QT 5.15.2

COVESA · Mar 11, 2024 · 7db4ce3 · 7db4ce3
1 parent e3051ae
commit 7db4ce3
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Install qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 5.12.12
+          version: 5.15.2
       - name: Build with CMake ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE;

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -79,7 +79,7 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           mirror: http://ftp.fau.de/qtproject/
-          version: 5.12.12
+          version: 5.15.2
       - name: Build ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE; $env:QTDIR=$env:Qt5_DIR.Replace('/','\');

diff --git a/scripts/linux/build.md b/scripts/linux/build.md
@@ -9,11 +9,11 @@ Configuration:
 - Administrator rights `sudo`
 - Build environment [install.sh](./install.sh)
     - `sudo dlt-viewer/scripts/linux/install.sh`
-- QT 5.12.10
+- QT 5.15.2
     - Default QT version published with each Ubuntu version is different. Good one is installed by `install.sh`
-    - Source QT5.12.10 environment. **Don't miss dot**.
-        - `. /opt/qt512/bin/qt512-env.sh`
-    - OR use `-DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake`
+    - Source QT5.15.2 environment. **Don't miss dot**.
+        - `. /opt/qt515/bin/qt515-env.sh`
+    - OR use `-DCMAKE_PREFIX_PATH=/opt/qt515/lib/cmake`
 - MS VS Code
 ```bash
 curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -

diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -ex
 
-# https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.12.10-bionic
-source /opt/qt512/bin/qt512-env.sh || true
+# https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.15.2-bionic
+source /opt/qt515/bin/qt515-env.sh || true
 
 SRC_DIR=$(pwd)
 BUILD_DIR="${SRC_DIR}/build"
@@ -27,7 +27,7 @@ cd "${BUILD_DIR}"
 echo Build with CMake
 cmake -G Ninja \
   -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
-  -DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \
+  -DCMAKE_PREFIX_PATH=/opt/qt515/lib/cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DDLT_USE_QT_RPATH=ON \
   -DDLT_PARSER=OFF \

diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh
@@ -9,9 +9,9 @@ sudo apt update
 sudo apt-get install -y --no-install-recommends apt-utils
 sudo apt install -y wget unzip software-properties-common lsb-release openssh-client curl
 
-# QT 5.12.10, is installed into /opt/qt512/
+# QT 5.15.2, is installed into /opt/qt515/
 sudo touch /etc/apt/sources.list
-sudo add-apt-repository -y ppa:beineri/opt-qt-5.12.10-$(lsb_release -cs)
+sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-$(lsb_release -cs)
 
 # Latest cmake for current platform
 sudo wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
@@ -22,7 +22,7 @@ sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 
 sudo apt update
 sudo apt install -y git cmake build-essential ninja-build \
-    qt512declarative qt512serialport qt512charts-no-lgpl qt512svg \
+    qt515declarative qt515serialport qt515charts-no-lgpl qt515svg \
     libgtk2.0-dev libgl-dev gcc-11 g++-11
 
 sudo update-alternatives --remove-all cpp
@@ -48,7 +48,7 @@ chmod a+x ~/bin/linuxdeploy-plugin-qt
 cd /opt
 git clone http://code.qt.io/qt/qtstyleplugins.git
 cd qtstyleplugins
-/opt/qt512/bin/qmake
+/opt/qt515/bin/qmake
 make -j$(nproc)
 sudo make install
 rm -rf /opt/qtstyleplugins
diff --git a/scripts/windows/.vscode_example/launch.json b/scripts/windows/.vscode_example/launch.json
@@ -16,7 +16,7 @@
                 }
             ],
             "console": "internalConsole",
-            "symbolSearchPath": "C:/Qt/Qt5.12.10/5.12.10/msvc2017_64",
+            "symbolSearchPath": "C:/Qt/Qt5.15.2/5.15.2/msvc2019_64",
             "visualizerFile": "c:\\Users\\%USER%\\AppData\\Roaming\\Code\\User\\workspaceStorage\\4b0d9a6cc41ecace0b5cf1701d8f6462\\tonka3000.qtvsctools\\qt.natvis.xml"
         }
     ]

diff --git a/scripts/windows/.vscode_example/settings.json b/scripts/windows/.vscode_example/settings.json
@@ -10,7 +10,7 @@
         "${workspaceFolder}/dlt-viewer/qdlt/**",
         "${workspaceFolder}/dlt-viewer/plugin/**",
         "${workspaceFolder}/dlt-viewer-plugins/**",
-        "c:/Qt/Qt5.12.10/5.12.10/msvc2017_64/include/**"
+        "c:/Qt/Qt5.15.2/5.15.2/msvc2019_64/include/**"
     ],
     "files.associations": {
         "qmutexlocker": "cpp",

diff --git a/scripts/windows/build.md b/scripts/windows/build.md
@@ -44,17 +44,17 @@ Configuration:
     - No need to download and install MS Visual Studio (Community Edition)
 - Ninja
     - Already bundled with VS Build Tools.
-- QT 5.12.10
+- QT 5.15.2
     - Later versions of QT5 will require using [QT Online installer](https://www.qt.io/download-qt-installer).
     - QT6 is not yet supported by DLT Viewer.
-    - https://download.qt.io/official_releases/qt/5.12/5.12.10/qt-opensource-windows-x86-5.12.10.exe
+    - https://download.qt.io/official_releases/qt/5.15/5.15.2/qt-opensource-windows-x86-5.15.2.exe
     - Install requires QT account. Use private E-Mail to register for free.
     - Select
         - [x] *MSVC 2017 64-bit*
         - [x] *QT Charts*
         - [x] *QT Creator* - Needed only for visual editing of `.ui` files.
     - No need to build QT from sources.
-    - Add `c:\Qt\Qt5.12.10\5.12.10\msvc2017_64\bin\` to PATH.
+    - Add `c:\Qt\Qt5.15.2\5.15.2\msvc2017_64\bin\` to PATH.
 - VS Code extensions
     - Just copy extension name in extension search box
     - `ms-vscode.cpptools`
@@ -82,9 +82,9 @@ Configuration:
     - Not included in offline QT installer https://bugreports.qt.io/browse/QTBUG-72733
     - Should be manually downloaded and installed
         - https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_51210/qt.qt5.51210.debug_info.win64_msvc2017_64/
-        - QT Base is enough for beginning. https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_51210/qt.qt5.51210.debug_info.win64_msvc2017_64/5.12.10-0-202011040843qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64-debug-symbols.7z
-    - Unpack over existing QT install into C:\Qt\Qt5.12.10\5.12.10\msvc2017_64\
-    - Set in *launch.json* `symbolSearchPath": "C:/Qt/Qt5.12.10/5.12.10/msvc2017_64",`
+        - QT Base is enough for beginning. https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_51210/qt.qt5.51210.debug_info.win64_msvc2017_64/5.15.2-0-202011040843qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64-debug-symbols.7z
+    - Unpack over existing QT install into C:\Qt\Qt5.15.2\5.15.2\msvc2017_64\
+    - Set in *launch.json* `symbolSearchPath": "C:/Qt/Qt5.15.2/5.15.2/msvc2017_64",`
     - Installing QT sources not necessary.
 - QT5 Natvis
     - Natvis is a Microsoft debugger visualization framework of MS VisualStudio and MS VS Code, built into [MIEngine](https://github.com/microsoft/MIEngine)