summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-29 03:00:12 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-29 03:00:12 +0200
commite394ce7c26104e0cc71690a6c732400297a48603 (patch)
treeb5ca7f46954da6f0228cede689568cc1d71ecbea
parent65bd71f3cb14c31bd4e11e0bc0f08171f2a3e788 (diff)
parenta61ed3bce7df1ec56712d874e23a7ec95ad141ab (diff)
downloadqtserialport-e394ce7c26104e0cc71690a6c732400297a48603.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1448658619df38755799578864f847d70a922c81
-rw-r--r--qtserialport.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtserialport.pro b/qtserialport.pro
index 57c1e20..3dabc4b 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -8,6 +8,7 @@ requires(!vxworks)
requires(!winrt)
requires(!uikit)
requires(!android)
+requires(!emscripten)
load(configure)
qtCompileTest(ntddmodm)