From 00ec195c262acd152537901bf9a5e881d6e40eb3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 23 Mar 2022 19:28:55 +0100 Subject: rbutil: Qt6 fixes. Change-Id: Ied6bdf1c5269b53ccfedc1d80f3f3f0d6b4011da --- utils/rbutilqt/main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'utils/rbutilqt/main.cpp') diff --git a/utils/rbutilqt/main.cpp b/utils/rbutilqt/main.cpp index 47c625b54d..cdee3af81d 100644 --- a/utils/rbutilqt/main.cpp +++ b/utils/rbutilqt/main.cpp @@ -39,7 +39,7 @@ Q_IMPORT_PLUGIN(AccessibleFactory) int main( int argc, char ** argv ) { -#if QT_VERSION >= 0x050600 +#if QT_VERSION >= 0x050600 && QT_VERSION < 0x060000 QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif @@ -83,7 +83,12 @@ int main( int argc, char ** argv ) { if(!translator.load("rbutil_" + applang, absolutePath)) translator.load("rbutil_" + applang, ":/lang"); if(!qttrans.load("qt_" + applang, - QLibraryInfo::location(QLibraryInfo::TranslationsPath))) +#if QT_VERSION >= 0x060000 + QLibraryInfo::path(QLibraryInfo::TranslationsPath) +#else + QLibraryInfo::location(QLibraryInfo::TranslationsPath) +#endif + )) qttrans.load("qt_" + applang, ":/lang"); QLocale::setDefault(QLocale(applang)); -- cgit v1.2.3