From b92854aed3992cc529294cd7c6540a0eea79bd0f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 4 Apr 2023 17:49:40 +0100 Subject: [PATCH] Android: don't break when finding opengl plugin avoid breaking when looking for the android plugin when the dependencies include opengl lib, since that was valid only in the early days where the Android plugin was separated into two raster and opengl. Now, that assumption is wrong and might affect the way the manual dependency works. Task-number: QTBUG-94232 Pick-to: 6.2 6.5 5.15 Change-Id: I025a5c8b2b064bb43a356a4ad5cb4a1ada41b09b Reviewed-by: Ville Voutilainen --- src/tools/androiddeployqt/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 9727f3f641d..b704612f0f7 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1599,7 +1599,6 @@ bool updateLibsXml(Options *options) || qtDependency.relativePath.contains( QString::asprintf("libQt%dQuick", QT_VERSION_MAJOR))) { options->usesOpenGL |= true; - break; } }