Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
This commit is contained in:
Oswald Buddenhagen
2018-02-07 20:17:09 +01:00
2 changed files with 0 additions and 7 deletions

6
.gitmodules vendored
View File

@@ -316,9 +316,3 @@
url = ../qtwebglplugin.git
branch = dev
status = preview
[submodule "qtopcua"]
depends = qtbase
path = qtopcua
url = ../qtopcua.git
branch = dev
status = preview