Skip to content

Commit bc83710

Browse files
committed
Merge #623: Getting ready to Qt 6 (9/n). Apply Qt 6 specific changes
d8d99d0 qt6: Do not use deprecated high DPI attributes in Qt 6 (Hennadii Stepanov) 8927bb8 refactor: Fix style in `initTranslations()` function (Hennadii Stepanov) ad73447 qt6: Do not use deprecated `QLibraryInfo::path` in Qt 6 (Hennadii Stepanov) 3f51d0b qt6: Fix type registration (Hennadii Stepanov) Pull request description: One more step in migration to Qt 6. Could be tested with hebasto/bitcoin#3 or bitcoin/bitcoin#24798. No behavior change when compiling with Qt 5. ACKs for top commit: laanwj: Code review ACK d8d99d0 jarolrod: ACK d8d99d0 Tree-SHA512: e5f92a80f8622e5f95dd98a90783956a26d3c8382b9ca8e479fb6c152cfdc85a2f6084e78d463ceea1e0f0b3ac72d2b086c8ca24967b2b6070553317e9e3252e
2 parents b9122e9 + d8d99d0 commit bc83710

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

src/qt/bitcoin.cpp

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ static void RegisterMetaTypes()
9696
qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon");
9797
qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
9898

99+
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
99100
qRegisterMetaTypeStreamOperators<BitcoinUnit>("BitcoinUnit");
101+
#else
102+
qRegisterMetaType<BitcoinUnit>("BitcoinUnit");
103+
#endif
100104
}
101105

102106
static QString GetLangTerritory()
@@ -135,21 +139,30 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
135139
// - First load the translator for the base language, without territory
136140
// - Then load the more specific locale translator
137141

142+
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
143+
const QString translation_path{QLibraryInfo::location(QLibraryInfo::TranslationsPath)};
144+
#else
145+
const QString translation_path{QLibraryInfo::path(QLibraryInfo::TranslationsPath)};
146+
#endif
138147
// Load e.g. qt_de.qm
139-
if (qtTranslatorBase.load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
148+
if (qtTranslatorBase.load("qt_" + lang, translation_path)) {
140149
QApplication::installTranslator(&qtTranslatorBase);
150+
}
141151

142152
// Load e.g. qt_de_DE.qm
143-
if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
153+
if (qtTranslator.load("qt_" + lang_territory, translation_path)) {
144154
QApplication::installTranslator(&qtTranslator);
155+
}
145156

146157
// Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in bitcoin.qrc)
147-
if (translatorBase.load(lang, ":/translations/"))
158+
if (translatorBase.load(lang, ":/translations/")) {
148159
QApplication::installTranslator(&translatorBase);
160+
}
149161

150162
// Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in bitcoin.qrc)
151-
if (translator.load(lang_territory, ":/translations/"))
163+
if (translator.load(lang_territory, ":/translations/")) {
152164
QApplication::installTranslator(&translator);
165+
}
153166
}
154167

155168
static bool InitSettings()
@@ -517,9 +530,11 @@ int GuiMain(int argc, char* argv[])
517530
Q_INIT_RESOURCE(bitcoin);
518531
Q_INIT_RESOURCE(bitcoin_locale);
519532

533+
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
520534
// Generate high-dpi pixmaps
521535
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
522536
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
537+
#endif
523538

524539
#if defined(QT_QPA_PLATFORM_ANDROID)
525540
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);

0 commit comments

Comments
 (0)