diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:02:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:02:51 +0200 |
commit | 450156f37356f67f217de760a5df3149684dd99f (patch) | |
tree | ca2e633ffedbc178f9e881f5fc775123f8e51ee9 | |
parent | d0916319060d795c7404a95cc52265be87a6cb9a (diff) | |
parent | c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 (diff) | |
download | qtserialport-450156f37356f67f217de760a5df3149684dd99f.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I28f3368a3120f0dbb53be1bb967b1463baa92576
-rw-r--r-- | configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.json b/configure.json index b42c0ba..1685700 100644 --- a/configure.json +++ b/configure.json @@ -1,3 +1,4 @@ { - "module": "serialport" + "module": "serialport", + "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm" } |