diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:12:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:47:42 +0100 |
| commit | 23ef4bab1faa867ba3614f0b5a325dc3a91550a1 (patch) | |
| tree | c1f776ad4792bb8e3ce3688f509cb47cadbd006c /sync.profile | |
| parent | a31a7e0b2b7b3de3e1867ad954ac7fad9531cc99 (diff) | |
| parent | 498b1424ce273beed02c5e1c93ed0ffd610624b8 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/canbus/peakcan/main.cpp
src/plugins/canbus/tinycan/main.cpp
src/serialbus/qcanbusframe.h
Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sync.profile b/sync.profile index 57da4d8..e7125c6 100644 --- a/sync.profile +++ b/sync.profile @@ -1,8 +1,3 @@ %modules = ( "QtSerialBus" => "$basedir/src/serialbus", ); - -%dependencies = ( - "qtbase" => "", - "qtserialport" => "", -); |