Update to Qt6
- New baseline minimum platform is Ubuntu 22.04
- Qt6 requires at least 6.2
- some deprecations may be flagged on later versions (e.g. 6.8)
- CMake requires at least 3.22
- Include build-tests.yml github action to validate builds on mulitple platforms
- QtTest is no longer optional since it easily comes along for the ride with Qt
- Replaced QStringRef in model::SubstitutionField with simple ParserState class
- Removed deprecations up to Qt 6.2
This commit is contained in:
@@ -9,14 +9,14 @@ include (TRANSLATION_FILES.txt)
|
||||
#
|
||||
# Update strings in C-locale translation files (lupdate+lrelease)
|
||||
#
|
||||
qt5_create_translation (glabels_C_qm_file
|
||||
qt6_create_translation (glabels_C_qm_file
|
||||
${CMAKE_SOURCE_DIR}/glabels
|
||||
${CMAKE_SOURCE_DIR}/model
|
||||
${CMAKE_SOURCE_DIR}/backends
|
||||
glabels_C.ts
|
||||
OPTIONS -no-obsolete -locations none
|
||||
)
|
||||
qt5_create_translation (templates_C_qm_file
|
||||
qt6_create_translation (templates_C_qm_file
|
||||
${CMAKE_CURRENT_BINARY_DIR}/template-strings.h
|
||||
templates_C.ts
|
||||
OPTIONS -no-obsolete -locations none
|
||||
@@ -25,7 +25,7 @@ qt5_create_translation (templates_C_qm_file
|
||||
#
|
||||
# Generate QM files from all other language translation files (lrelease only)
|
||||
#
|
||||
qt5_add_translation (language_qm_files
|
||||
qt6_add_translation (language_qm_files
|
||||
${GLABELS_TS_FILES}
|
||||
${TEMPLATES_TS_FILES}
|
||||
)
|
||||
@@ -50,8 +50,8 @@ target_compile_features (Model
|
||||
)
|
||||
|
||||
target_link_libraries (XmlStrings
|
||||
Qt5::Core
|
||||
Qt5::Xml
|
||||
Qt6::Core
|
||||
Qt6::Xml
|
||||
)
|
||||
|
||||
#=======================================
|
||||
|
||||
Reference in New Issue
Block a user