Switch to Qt 6.6.1 and tools version update (#293)

* Switch to 6.6.1 * Restore explicit versions
SavenkovIgor · Dec 17, 2023 · f0f5d35 · f0f5d35
1 parent e0e7c3c
commit f0f5d35
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/AppBuild.yml b/.github/workflows/AppBuild.yml
@@ -7,11 +7,11 @@ on:
     branches: [ "main" ]
 
 env:
-  EMSDK_VERSION: 3.1.25
-  QT_VERSION: 6.5.0
+  EMSDK_VERSION: 3.1.37
+  QT_VERSION: 6.6.1
   QT_ROOT: ${{ github.workspace }}/Qt
-  CONAN_VERSION: 2.0.6
-  AQT_VERSION: ==3.1.5
+  CONAN_VERSION: 2.0.14
+  AQT_VERSION: ==3.1.11
   PY7ZR_VERSION: ==0.20.2
 
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ if (NOT WASM)
     add_subdirectory ("${LIBS_ROOT}/TermDataStorage"    "${CMAKE_BINARY_DIR}/lib/TermDataStorage")
 endif ()
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_executable (TermGraph
     "android/AndroidManifest.xml"

diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ If you try to draw the first few "layers" of these terms, it will look like a la
 ## 🧬 Tech stack
 
 - <img src="https://isocpp.org/favicon.ico" width="16" height="16"> C++ 20
-- <img src="https://www.qt.io/hubfs/2016_Qt_Logo/qt_logo_green_rgb_16x16.png" width="16" height="16"> Qt 6.5 | Qml
+- <img src="https://www.qt.io/hubfs/2016_Qt_Logo/qt_logo_green_rgb_16x16.png" width="16" height="16"> Qt 6.6 | Qml
 - <img src="https://cmake.org/wp-content/uploads/2019/05/cropped-cmake_512-32x32.png" width="16" height="16"> Cmake 3.22+
 - <img src="https://conan.io/favicon.png" width="16" height="16"> Conan 2
 - [GTest lib](https://github.com/google/googletest) (tests)

diff --git a/lib/QmlAtoms/CMakeLists.txt b/lib/QmlAtoms/CMakeLists.txt
@@ -6,7 +6,7 @@ project (AtomsModule LANGUAGES CXX)
 
 find_package (Qt6 REQUIRED COMPONENTS QuickControls2)
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_library (AtomsModule STATIC)
 

diff --git a/lib/QmlMolecules/CMakeLists.txt b/lib/QmlMolecules/CMakeLists.txt
@@ -6,7 +6,7 @@ project (MoleculesModule LANGUAGES CXX)
 
 find_package (Qt6 REQUIRED COMPONENTS QuickControls2)
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_library (MoleculesModule STATIC)
 

diff --git a/lib/QmlPages/CMakeLists.txt b/lib/QmlPages/CMakeLists.txt
@@ -6,7 +6,7 @@ project (PagesModule LANGUAGES CXX)
 
 find_package (Qt6 REQUIRED COMPONENTS QuickControls2)
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_library (PagesModule STATIC)
 

diff --git a/lib/QmlTheme/CMakeLists.txt b/lib/QmlTheme/CMakeLists.txt
@@ -6,7 +6,7 @@ project (ThemeModule LANGUAGES CXX)
 
 find_package (Qt6 REQUIRED COMPONENTS Core QuickControls2 Svg)
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_library (ThemeModule STATIC)
 

diff --git a/lib/QmlTools/CMakeLists.txt b/lib/QmlTools/CMakeLists.txt
@@ -6,7 +6,7 @@ project (ToolsModule LANGUAGES CXX)
 
 find_package (Qt6 REQUIRED COMPONENTS QuickControls2)
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.6)
 
 qt_add_library (ToolsModule STATIC)
 

diff --git a/project.py b/project.py
@@ -56,7 +56,7 @@ def env_qt_root() -> Path:
 
 def configure_environment(for_wasm: bool = False):
     set_env_var_if_missed('QT_ROOT',    default_value=os.path.expanduser('~/Qt'))
-    set_env_var_if_missed('QT_VERSION', default_value='6.5.0')
+    set_env_var_if_missed('QT_VERSION', default_value='6.6.1')
 
     assert_variable_exist('QT_VERSION', example='x.y.z')
     assert_variable_exist('QT_ROOT',    example='~/Qt')