diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-07 15:27:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-07 15:50:41 +0000 |
| commit | d196866f31bc8101ed10802ce28076bc875f33e2 (patch) | |
| tree | efbecd39a2d5ba2b3c62d21befdad5b717e7723d /.gitmodules | |
| parent | 01b9b9051b4bf926265199fe05db131da36bcae0 (diff) | |
Revert "Temporarily ignore qtwayland"
QtWayland adapted to new api in qtbase.
This reverts commit eba433c1264d3272c9f1a8390ef2b7528e330e7b.
Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 0ffc8efe..1fc98730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -129,7 +129,7 @@ path = qtwayland url = ../qtwayland.git branch = dev - status = ignore + status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad |