diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:00:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:00:30 +0100 |
| commit | 5e5c291c7dcd535a13b03cf6efce7a9428183d1a (patch) | |
| tree | a1610ebfd55094b9ecada2d037efe329fe7f54c5 | |
| parent | 2030c8827971973514b2b65479cffc473f2b34c4 (diff) | |
| parent | a8f83d4a3ebbe106a84183178b715bdff24768b3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I2d9e9deb651a3602bef5feae30b147462bcb15a8
| -rw-r--r-- | src/multimedia/configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index 0e9cfc9f7..e9480dfc5 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -3,6 +3,7 @@ "depends": [ "gui" ], + "condition": "module.gui", "testDir": "../../config.tests", "commandline": { @@ -256,7 +257,7 @@ }, "gstreamer_gl": { "label": "GStreamer OpenGL", - "condition": "features.gstreamer_1_0 && libs.gstreamer_gl_1_0", + "condition": "features.opengl && features.gstreamer_1_0 && libs.gstreamer_gl_1_0", "output": [ "privateFeature" ] }, "gstreamer_imxcommon": { |