summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2020-02-17 10:54:47 +0100
committerDominik Holland <dominik.holland@qt.io>2020-02-26 11:41:14 +0100
commit60d2093105e43b0fe352ebe3e9e7a6bed73b8b98 (patch)
tree4e02473000a3a5885c325b36f3d15fa793c12273
parent6e48644a69dd16f980614af145ed327964db19d8 (diff)
downloadqtivi-60d2093105e43b0fe352ebe3e9e7a6bed73b8b98.tar.gz
Remove tracking branch from qface submodule
Usually we always use a commit in the upstream/develop branch, but for the 1.10 bugfix, we need to switch the branch. To make our life easier, remove the tracking branch completely to accept any sha in the CI. Change-Id: Ieb9e003691d4ffab0e1f73737b70936574066877 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit c5819507845082400ab90fddb3e77f159fc116f6) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
-rw-r--r--.gitmodules1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 25448fe..36ff789 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
[submodule "src/3rdparty/qface"]
path = src/3rdparty/qface
url = ../qtivi-qface.git
- branch = upstream/develop
[submodule "src/3rdparty/taglib/taglib"]
path = src/3rdparty/taglib/taglib
url = ../qtivi-taglib.git