AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version

Browse Source 
CMake edition.
Also update default compiled version.

Task-number: QTQAINFRA-4126
Change-Id: Ia6f535f553e73bd6b00e2e20752f4961af21ede5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Paul Wicking 2021-01-07 09:08:06 +01:00
parent 149ad1e615
commit 9a12f7e083
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cmake.conf
View File

@ -1,4 +1,4 @@
set(QT_REPO_MODULE_VERSION "6.0.0")
set(QT_REPO_MODULE_VERSION "6.1.0")
# Minimum requirement for building Qt
set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.18")

5
src/corelib/serialization/qdatastream.h
View File

@ -97,8 +97,9 @@ public:
Qt_5_14 = Qt_5_13,
Qt_5_15 = Qt_5_14,
Qt_6_0 = 20,
Qt_DefaultCompiledVersion = Qt_6_0
#if QT_VERSION >= 0x060100
Qt_6_1 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_1
#if QT_VERSION >= 0x060200
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif
};

2
src/plugins/sqldrivers/.cmake.conf
View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.0.0")
set(QT_REPO_MODULE_VERSION "6.1.0")