summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-01 03:02:27 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-01 03:02:27 +0200
commitc9c7dd79a78e1192ce7b5bef4b7db8d9c6fd79a0 (patch)
treeaa0e379dba96be0917b4ff7ad930cda1eb071d8d
parent0880c04eec2653b94ac58f0e20a2215243fd1c66 (diff)
parente6c5b44453635be0f05f3ee9545e3cb348e1b1a9 (diff)
downloadqtwebchannel-c9c7dd79a78e1192ce7b5bef4b7db8d9c6fd79a0.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I65d400d1038774826a9a905fa91ededf016df801
-rw-r--r--configure.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.json b/configure.json
new file mode 100644
index 0000000..7a72a33
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,3 @@
+{
+ "module": "webchannel"
+}