summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-16 03:04:13 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-16 03:04:13 +0100
commit31f06ca32ebd87c5b1bad6882e2d0b4689c7e85a (patch)
treec21d51106c74ac61e1fe7d8457ab1f0cd3438cc6
parentd5ed6b5cfd8b8af6c9396a1234df1633aa22dbd8 (diff)
parentb1662da58d05dd53b5d4c84a3518c65f417cefd8 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
-rw-r--r--qtwebglplugin.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qtwebglplugin.pro b/qtwebglplugin.pro
index f16dfaf..2bbe74e 100644
--- a/qtwebglplugin.pro
+++ b/qtwebglplugin.pro
@@ -1,3 +1,3 @@
-requires(!winrt:!watchos:qtHaveModule(websockets):qtHaveModule(gui):qtConfig(opengl))
+requires(!winrt:!watchos:!android:qtHaveModule(websockets):qtHaveModule(gui):qtConfig(opengl))
load(qt_parts)