whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: use Qt major version for detecting OpenGL and QtQuick libraries 

Change-Id: Ia7651ad09d7aab70cf32fcd56f9fb75202ace768
Pick-to: 6.3 6.2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Sona Kurazyan 2022-04-14 12:52:28 +02:00
parent 7febf0b30e
commit 77b9ddfb53
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/androiddeployqt/main.cpp
View File

@ -1474,8 +1474,10 @@ bool updateLibsXml(Options *options)
plugin = qtDependency.relativePath;
}
if (qtDependency.relativePath.contains("libQt5OpenGL"_L1)
|| qtDependency.relativePath.contains("libQt5Quick"_L1)) {
if (qtDependency.relativePath.contains(
QString::asprintf("libQt%dOpenGL", QT_VERSION_MAJOR))
|| qtDependency.relativePath.contains(
QString::asprintf("libQt%dQuick", QT_VERSION_MAJOR))) {
options->usesOpenGL |= true;
break;
}