diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
| commit | 25eb97d2d450fbfe761559f1ae87a2e88c8c6b2d (patch) | |
| tree | a96380908abb944ff374201321fa5a50d15b770a /src/tools | |
| parent | fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f (diff) | |
| parent | 0d6b4b519272915c2690ee12d1834823747233ab (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
src/network/ssl/qsslsocket_openssl.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rcc/rcc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 94f6911010..9acbce25ff 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -59,7 +59,7 @@ enum { CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70 }; -#if QT_CONFIG(zstd) +#if QT_CONFIG(zstd) && QT_VERSION >= QT_VERSION_CHECK(6,0,0) # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zstd #elif !defined(QT_NO_COMPRESS) # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zlib |