aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-29 13:03:18 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-29 12:12:54 +0000
commit0fb525f9ef335633c0aa4c65e818e9ab5ce4e1ee (patch)
tree4fde68579c0195deb2365cef93141c7368528465 /.gitmodules
parent010595af45ffd3ba4b5f053113c326b135e14a82 (diff)
Add x11extras to the qt5 build
Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index f004618a..a0f11be2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -175,8 +175,8 @@
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras