Use QT_DEPRECATED_WARNINGS_SINCE
This commit is contained in:
parent
29d93d348c
commit
96ef82272b
|
@ -324,7 +324,10 @@ void Launcher::initHighDpi() {
|
||||||
qputenv("QT_DPI_ADJUSTMENT_POLICY", "AdjustDpi");
|
qputenv("QT_DPI_ADJUSTMENT_POLICY", "AdjustDpi");
|
||||||
#endif // Qt < 6.2.0
|
#endif // Qt < 6.2.0
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
||||||
|
#endif // Qt < 6.0.0
|
||||||
|
|
||||||
if (OptionFractionalScalingEnabled.value()) {
|
if (OptionFractionalScalingEnabled.value()) {
|
||||||
QApplication::setHighDpiScaleFactorRoundingPolicy(
|
QApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||||
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||||
|
|
|
@ -17,7 +17,6 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initHook() override;
|
void initHook() override;
|
||||||
void initHighDpi() override;
|
|
||||||
|
|
||||||
bool launchUpdater(UpdaterLaunch action) override;
|
bool launchUpdater(UpdaterLaunch action) override;
|
||||||
|
|
||||||
|
|
|
@ -27,11 +27,6 @@ void Launcher::initHook() {
|
||||||
base::RegisterBundledResources(u"Telegram.rcc"_q);
|
base::RegisterBundledResources(u"Telegram.rcc"_q);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Launcher::initHighDpi() {
|
|
||||||
// macOS Retina display support is working fine.
|
|
||||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Launcher::launchUpdater(UpdaterLaunch action) {
|
bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
if (cExeName().isEmpty()) {
|
if (cExeName().isEmpty()) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -241,13 +241,12 @@ elseif (APPLE)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
target_compile_options_if_exists(lib_tgcalls
|
||||||
target_compile_options(lib_tgcalls
|
PRIVATE
|
||||||
PRIVATE
|
-Wno-deprecated-volatile
|
||||||
-Wno-deprecated-volatile
|
-Wno-ambiguous-reversed-operator
|
||||||
-Wno-ambiguous-reversed-operator
|
-Wno-deprecated-declarations
|
||||||
)
|
)
|
||||||
endif()
|
|
||||||
|
|
||||||
remove_target_sources(lib_tgcalls ${tgcalls_loc}
|
remove_target_sources(lib_tgcalls ${tgcalls_loc}
|
||||||
platform/android/AndroidContext.cpp
|
platform/android/AndroidContext.cpp
|
||||||
|
|
Loading…
Reference in New Issue