diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:01:03 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:01:04 +0100 |
commit | dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e (patch) | |
tree | c67604a780dfb147ac9040d6ad8ccae333d7c11b /qtserialport.pro | |
parent | e6a5786518d1a722611516e478aca6e0feea2b42 (diff) | |
parent | b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1
Change-Id: I3931aca16393acc9c698dcf018801e1d031004bc
Diffstat (limited to 'qtserialport.pro')
-rw-r--r-- | qtserialport.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qtserialport.pro b/qtserialport.pro index 3dabc4b6..5b7cd414 100644 --- a/qtserialport.pro +++ b/qtserialport.pro @@ -7,7 +7,6 @@ requires(!integrity) requires(!vxworks) requires(!winrt) requires(!uikit) -requires(!android) requires(!emscripten) load(configure) |