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

Change-Id: Ia7651ad09d7aab70cf32fcd56f9fb75202ace768 Pick-to: 6.3 6.2 Reviewed-by: Assam Boudjelthia <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]>
zoldalis · Apr 22, 2022 · 77b9ddf · 77b9ddf
1 parent 7febf0b
commit 77b9ddf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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;
                 }