From 5f53dfda0eb5a211e1eaa6539d47ebe4352994b6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 27 Aug 2022 01:45:07 +0400 Subject: [PATCH] Move Qt version from configure.py to CMakeLists.txt --- CMakeLists.txt | 7 +++++++ Telegram/configure.py | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9694f98ccb..5d170fe480 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,13 @@ include(cmake/target_prepare_qrc.cmake) include(cmake/options.cmake) +if (NOT DESKTOP_APP_USE_PACKAGED) + if (WIN32) + set(qt_version 5.15.4) + else() + set(qt_version 6.3.1) + endif() +endif() include(cmake/external/qt/package.cmake) set(desktop_app_skip_libs diff --git a/Telegram/configure.py b/Telegram/configure.py index 22c7d15d72..fe24b92737 100644 --- a/Telegram/configure.py +++ b/Telegram/configure.py @@ -60,5 +60,4 @@ if officialTarget != '': if arch != '': arguments.append(arch) -os.environ["QT"] = "5.15.4" if sys.platform == 'win32' else "6.3.1" finish(run_cmake.run(scriptName, arguments))