summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-19 03:04:51 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-19 03:04:51 +0200
commitdd22f6091527902d92568f6ec2a27e8c8d52f17c (patch)
tree32eea951c287d20f9ae4a7d2f44b441c954b571f
parente32b4856308c0c9c7566031022242594fd5425bf (diff)
parentd5a8b58280b3e0263a22edc2a8a811f3252df27e (diff)
downloadqtserialport-dd22f6091527902d92568f6ec2a27e8c8d52f17c.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I3449349500f7b7a1ac59d663a5cb6790c2cf8f59
-rw-r--r--src/serialport/configure.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/serialport/configure.json b/src/serialport/configure.json
index f0e6c76..c969b86 100644
--- a/src/serialport/configure.json
+++ b/src/serialport/configure.json
@@ -4,7 +4,6 @@
"depends": [
"core"
],
- "condition": "module.core",
"tests": {
"ntddmodm": {