summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-07 14:23:13 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-07 13:30:20 +0000
commiteba433c1264d3272c9f1a8390ef2b7528e330e7b (patch)
treea62cc82c6320dc8f31ccf01938cd333bd33a0a9e
parent04727e993674c94c2ddc8118b7d8098e21597e1b (diff)
Temporarily ignore qtwayland
qtbase changed API, qssize_t was changed to qsizetype. In order for qtwayland to update, qt5 needs to update first; but in order for qt5 to update, qtwayland needs to compile. Ignoring breaks cycle. Task-number: QTBUG-65600 Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 1fc98730..0ffc8efe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -129,7 +129,7 @@
path = qtwayland
url = ../qtwayland.git
branch = dev
- status = addon
+ status = ignore
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad