mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: replace deprecated methods

Browse source 
Sadly the replacements are new in Qt6.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-15 12:20:49 -08:00
parent 300248f446
commit 2ede1a4563
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/qt-init.cpp
View file

@ -83,8 +83,12 @@ void init_qt_late()
QString translationLocation; QString translationLocation;
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
translationLocation = QLatin1String(":/"); translationLocation = QLatin1String(":/");
#else
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
translationLocation = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
#else #else
translationLocation = QLibraryInfo::location(QLibraryInfo::TranslationsPath); translationLocation = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
#endif
#endif #endif
if (uiLang != "en_US" && uiLang != "en-US") { if (uiLang != "en_US" && uiLang != "en-US") {
if (qtTranslator.load(loc, "qtbase", "_", translationLocation) || if (qtTranslator.load(loc, "qtbase", "_", translationLocation) ||

4
core/settings/qPrefPrivate.cpp
View file

@ -20,7 +20,11 @@ void qPrefPrivate::propSetValue(const QString &key, const QVariant &value, const
{ {
QSettings s; QSettings s;
bool isDefault = false; bool isDefault = false;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (value.isValid() && value.typeId() == QMetaType::Double)
#else
if (value.isValid() && value.type() == QVariant::Double) if (value.isValid() && value.type() == QVariant::Double)
#endif
isDefault = IS_FP_SAME(value.toDouble(), defaultValue.toDouble()); isDefault = IS_FP_SAME(value.toDouble(), defaultValue.toDouble());
else else
isDefault = (value == defaultValue); isDefault = (value == defaultValue);