From 830f8ac7f2d575cf2d3cdbcbf9bb86cc56a7d67e Mon Sep 17 00:00:00 2001 From: Harald Vistnes Date: Tue, 1 Aug 2017 23:24:12 +0200 Subject: Make Qt3D depend on qtbase and optionally on qtdeclarative This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira Reviewed-by: Sean Harmer --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 145fac4f..9ea5c3b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9 status = addon [submodule "qt3d"] - depends = qtdeclarative - recommends = qtimageformats qtgamepad + depends = qtbase + recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9 -- cgit v1.2.3 From 5a0dc401fad4adccbd975392295d2c77d936900f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 8 Aug 2017 13:49:40 +0200 Subject: Remove QtWebKit and QtWebKit examples from Qt 5 They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev --- .gitmodules | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 9ea5c3b2..b4988927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,7 +38,7 @@ status = essential [submodule "qttools"] depends = qtbase - recommends = qtdeclarative qtactiveqt qtwebkit + recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git branch = 5.9 @@ -69,21 +69,6 @@ branch = master status = essential project = - -[submodule "qtwebkit"] - depends = qtbase - recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns - path = qtwebkit - url = ../qtwebkit.git - branch = 5.9 - status = obsolete - project = WebKit.pro - priority = 20 -[submodule "qtwebkit-examples"] - depends = qtwebkit qttools - path = qtwebkit-examples - url = ../qtwebkit-examples.git - branch = 5.9 - status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa @@ -238,7 +223,6 @@ [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools - serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git branch = 5.9 -- cgit v1.2.3