diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-14 12:52:28 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-22 20:43:50 +0200 |
| commit | 77b9ddfb53cdbc7a5d348800cc2f85a944c0a008 (patch) | |
| tree | a9212d464c1553e96a1bd3a6dcb4951dd84e6d8f /src/tools/androiddeployqt | |
| parent | 7febf0b30e8a6d74f0d78b0e727c52d18672a991 (diff) | |
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>
Diffstat (limited to 'src/tools/androiddeployqt')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 7f6a5d30f1..dec9e4505f 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -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; } |