From 40b07da1941a66a748c293cbe91668debd63c59a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 24 Apr 2017 13:43:05 +0200 Subject: make sure that all submodule urls end in .git http(s) needs that. Started-by: Alvaro Denis Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 8be71f45..6355ce8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -295,32 +295,32 @@ depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad + url = ../qtgamepad.git branch = 5.9 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml + url = ../qtscxml.git branch = 5.9 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech + url = ../qtspeech.git branch = 5.9 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth - url = ../qtnetworkauth + url = ../qtnetworkauth.git branch = 5.9 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects - url = ../qtremoteobjects + url = ../qtremoteobjects.git branch = 5.9 status = preview -- cgit v1.2.3 From 933688fc39b21fae8f201fed29ab46cf8ce5ded9 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 27 Apr 2017 12:54:54 +0900 Subject: Change qt3d dependency on qtimageformats to optional only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 6355ce8b..a9d23be2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9 status = addon [submodule "qt3d"] - depends = qtdeclarative qtimageformats - recommends = qtgamepad + depends = qtdeclarative + recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9 -- cgit v1.2.3