Look for QtKeychain translations with Qt 6, too

quotient-im · Dec 27, 2023 · f9ca9be · f9ca9be
1 parent 9847921
commit f9ca9be
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/client/main.cpp b/client/main.cpp
@@ -142,6 +142,9 @@ int main( int argc, char* argv[] )
         qCInfo(MAIN) << "Using locale" << QLocale().name();
     }
 
+// Extract a number from another macro and turn it to a const char[]
+#define ITOA(i) #i
+
     loadTranslations(
         { { { "qt", "qtbase", "qtnetwork", "qtdeclarative", "qtmultimedia",
               "qtquickcontrols", "qtquickcontrols2",
@@ -151,13 +154,15 @@ int main( int argc, char* argv[] )
             QLibraryInfo::location(QLibraryInfo::TranslationsPath) },
           { { "qtkeychain" },
             QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                   "qt5keychain/translations",
+                                   "qt" ITOA(QT_VERSION_MAJOR) "keychain/translations",
                                    QStandardPaths::LocateDirectory) },
           { { "qt", "qtkeychain", "quotient", "quaternion" },
             QStandardPaths::locate(QStandardPaths::AppLocalDataLocation,
                                    "translations",
                                    QStandardPaths::LocateDirectory) } });
 
+#undef ITOA
+
     Quotient::NetworkSettings().setupApplicationProxy();
 
     MainWindow window;