diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-07 20:17:09 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-07 20:17:09 +0100 |
| commit | 9c506a51646a0a74b5aea88d35e00e10b4e8cd37 (patch) | |
| tree | 99474c1db654f5ebc3eda83f1251f075a5bc125c | |
| parent | 9680fa78606f04cb31f143bf337df69c89d876fa (diff) | |
| parent | d212f48b67cdae794affecd8285aca419bbb7f8c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | qtopcua | 0 |
2 files changed, 0 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 64a36638..f1a6f8e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -316,9 +316,3 @@ url = ../qtwebglplugin.git branch = dev status = preview -[submodule "qtopcua"] - depends = qtbase - path = qtopcua - url = ../qtopcua.git - branch = dev - status = preview diff --git a/qtopcua b/qtopcua deleted file mode 160000 -Subproject 05fc06658e75c92222624c12f30105d8eee44c6 |