From 4d67b1e1fd6864a9d19b1410c698d07a14386384 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 31 May 2021 10:30:36 +0300 Subject: [PATCH] Restore qtmultimedia as a addon in qt5.git According to plan Qt Multimedia will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93129 Pick-to: dev Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391 Reviewed-by: Lars Knoll --- .gitmodules | 1 - qtmultimedia | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a9c78ea5..8952dc6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,6 @@ path = qtmultimedia url = ../qtmultimedia.git branch = 6.2 - status = ignore [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt diff --git a/qtmultimedia b/qtmultimedia index bb64e9df..3287ad86 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bb64e9df20003d705820544f55b081d22bd62878 +Subproject commit 3287ad8656b700f245834f09458bc1613beb9757