diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:28:55 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:34:30 +0100 |
commit | 00ec195c262acd152537901bf9a5e881d6e40eb3 (patch) | |
tree | 413468682847e0d50a5f9c491e2b92b64fc87bc9 | |
parent | 948637c42cb9feb228f26a603391be6343782b51 (diff) | |
download | rockbox-00ec195c262acd152537901bf9a5e881d6e40eb3.tar.gz rockbox-00ec195c262acd152537901bf9a5e881d6e40eb3.zip |
rbutil: Qt6 fixes.
Change-Id: Ied6bdf1c5269b53ccfedc1d80f3f3f0d6b4011da
-rw-r--r-- | utils/CMakeLists.txt | 10 | ||||
-rw-r--r-- | utils/rbutilqt/CMakeLists.txt | 3 | ||||
-rw-r--r-- | utils/rbutilqt/main.cpp | 9 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 6 |
4 files changed, 22 insertions, 6 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index d874f083b5..fc122426a2 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt | |||
@@ -48,13 +48,15 @@ enable_testing() | |||
48 | # Qt | 48 | # Qt |
49 | find_package(QT NAMES Qt6 Qt5 REQUIRED) | 49 | find_package(QT NAMES Qt6 Qt5 REQUIRED) |
50 | if(QT_VERSION_MAJOR EQUAL 5) | 50 | if(QT_VERSION_MAJOR EQUAL 5) |
51 | find_package(Qt5 COMPONENTS Core Widgets Svg Multimedia Network Test LinguistTools REQUIRED) | 51 | find_package(Qt5 REQUIRED COMPONENTS |
52 | Core Widgets Svg Multimedia Network Test LinguistTools) | ||
52 | else() | 53 | else() |
53 | find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat Widgets Svg Multimedia Network LinguistTools | 54 | find_package(Qt6 REQUIRED COMPONENTS |
55 | Core Core5Compat Widgets Svg Multimedia Network LinguistTools SvgWidgets | ||
54 | OPTIONAL_COMPONENTS Test) | 56 | OPTIONAL_COMPONENTS Test) |
55 | endif() | 57 | endif() |
56 | get_target_property(_qmake_executable Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION) | 58 | get_target_property(_moc_executable Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION) |
57 | get_filename_component(QT_BINDIR "${_qmake_executable}" DIRECTORY) | 59 | get_filename_component(QT_BINDIR "${_moc_executable}" DIRECTORY) |
58 | message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}") | 60 | message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}") |
59 | 61 | ||
60 | # If we're on Linux, try to find the used libs in the system. | 62 | # If we're on Linux, try to find the used libs in the system. |
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt index 6b4062c266..8a6a5facda 100644 --- a/utils/rbutilqt/CMakeLists.txt +++ b/utils/rbutilqt/CMakeLists.txt | |||
@@ -125,6 +125,9 @@ endif() | |||
125 | target_link_libraries(RockboxUtility rbbase cutelogger gitversion | 125 | target_link_libraries(RockboxUtility rbbase cutelogger gitversion |
126 | Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia | 126 | Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia |
127 | Qt${QT_VERSION_MAJOR}::Svg) | 127 | Qt${QT_VERSION_MAJOR}::Svg) |
128 | if(QT_VERSION_MAJOR EQUAL 6) | ||
129 | target_link_libraries(RockboxUtility Qt${QT_VERSION_MAJOR}::SvgWidgets) | ||
130 | endif() | ||
128 | 131 | ||
129 | target_include_directories(RockboxUtility PRIVATE | 132 | target_include_directories(RockboxUtility PRIVATE |
130 | ${CMAKE_CURRENT_LIST_DIR}/gui | 133 | ${CMAKE_CURRENT_LIST_DIR}/gui |
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) | |||
39 | 39 | ||
40 | 40 | ||
41 | int main( int argc, char ** argv ) { | 41 | int main( int argc, char ** argv ) { |
42 | #if QT_VERSION >= 0x050600 | 42 | #if QT_VERSION >= 0x050600 && QT_VERSION < 0x060000 |
43 | QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); | 43 | QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); |
44 | QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); | 44 | QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); |
45 | #endif | 45 | #endif |
@@ -83,7 +83,12 @@ int main( int argc, char ** argv ) { | |||
83 | if(!translator.load("rbutil_" + applang, absolutePath)) | 83 | if(!translator.load("rbutil_" + applang, absolutePath)) |
84 | translator.load("rbutil_" + applang, ":/lang"); | 84 | translator.load("rbutil_" + applang, ":/lang"); |
85 | if(!qttrans.load("qt_" + applang, | 85 | if(!qttrans.load("qt_" + applang, |
86 | QLibraryInfo::location(QLibraryInfo::TranslationsPath))) | 86 | #if QT_VERSION >= 0x060000 |
87 | QLibraryInfo::path(QLibraryInfo::TranslationsPath) | ||
88 | #else | ||
89 | QLibraryInfo::location(QLibraryInfo::TranslationsPath) | ||
90 | #endif | ||
91 | )) | ||
87 | qttrans.load("qt_" + applang, ":/lang"); | 92 | qttrans.load("qt_" + applang, ":/lang"); |
88 | 93 | ||
89 | QLocale::setDefault(QLocale(applang)); | 94 | QLocale::setDefault(QLocale(applang)); |
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp index 5be60050d6..7edfc91cd1 100644 --- a/utils/rbutilqt/themesinstallwindow.cpp +++ b/utils/rbutilqt/themesinstallwindow.cpp | |||
@@ -109,7 +109,9 @@ void ThemesInstallWindow::downloadDone(QNetworkReply::NetworkError error) | |||
109 | themesInfo.open(); | 109 | themesInfo.open(); |
110 | 110 | ||
111 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 111 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
112 | #if QT_VERSION < 0x060000 | ||
112 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); | 113 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); |
114 | #endif | ||
113 | QStringList tl = iniDetails.childGroups(); | 115 | QStringList tl = iniDetails.childGroups(); |
114 | LOG_INFO() << "Theme site result:" | 116 | LOG_INFO() << "Theme site result:" |
115 | << iniDetails.value("error/code").toString() | 117 | << iniDetails.value("error/code").toString() |
@@ -183,7 +185,9 @@ void ThemesInstallWindow::updateSize(void) | |||
183 | long size = 0; | 185 | long size = 0; |
184 | // sum up size for all selected themes | 186 | // sum up size for all selected themes |
185 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 187 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
188 | #if QT_VERSION < 0x060000 | ||
186 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); | 189 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); |
190 | #endif | ||
187 | int items = ui.listThemes->selectedItems().size(); | 191 | int items = ui.listThemes->selectedItems().size(); |
188 | for(int i = 0; i < items; i++) { | 192 | for(int i = 0; i < items; i++) { |
189 | iniDetails.beginGroup(ui.listThemes->selectedItems() | 193 | iniDetails.beginGroup(ui.listThemes->selectedItems() |
@@ -202,7 +206,9 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p | |||
202 | return; | 206 | return; |
203 | 207 | ||
204 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 208 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
209 | #if QT_VERSION < 0x060000 | ||
205 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); | 210 | iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8")); |
211 | #endif | ||
206 | 212 | ||
207 | QCoreApplication::processEvents(); | 213 | QCoreApplication::processEvents(); |
208 | ui.themeDescription->setText(tr("fetching details for %1") | 214 | ui.themeDescription->setText(tr("fetching details for %1") |