diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
| commit | 196097bfc84d297199ea591fc19e714c88796e8e (patch) | |
| tree | 44db9b8047021f358a009b1d8662e69711f6b969 /tests/global/global.cfg | |
| parent | 1cbc05a6568db5e0ff094f8e09723c607ade88af (diff) | |
| parent | 87d83df5f3fa2a582385e70dc22c4a9789134f99 (diff) | |
| download | qtwebchannel-196097bfc84d297199ea591fc19e714c88796e8e.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
Diffstat (limited to 'tests/global/global.cfg')
| -rw-r--r-- | tests/global/global.cfg | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/global/global.cfg b/tests/global/global.cfg new file mode 100644 index 0000000..9f37e52 --- /dev/null +++ b/tests/global/global.cfg @@ -0,0 +1,5 @@ +<config> +<modules> +<module name="QtWebChannel" qtname="webchannel"/> +</modules> +</config> |