diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:07 +0100 |
| commit | 1399a77954ec4b40fa14b75218e046e76d1324bc (patch) | |
| tree | a1ac141e729b5d8fb58aa0504a8d751a9348473e /examples | |
| parent | 44a449ff8f0b7cdb71e67385e1bd9a098209045e (diff) | |
| parent | b65de45fbfa08d0d2d5b89df77181d3726598097 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ibcb5508d7f131cbeba0d047111177a8dff1e5f68
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serialbus/can/can.pro | 1 | ||||
| -rw-r--r-- | examples/serialbus/modbus/adueditor/adueditor.pro | 1 | ||||
| -rw-r--r-- | examples/serialbus/modbus/master/master.pro | 1 | ||||
| -rw-r--r-- | examples/serialbus/modbus/slave/slave.pro | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/serialbus/can/can.pro b/examples/serialbus/can/can.pro index 017589a..81e29ee 100644 --- a/examples/serialbus/can/can.pro +++ b/examples/serialbus/can/can.pro @@ -1,4 +1,5 @@ QT += serialbus widgets +requires(qtConfig(combobox)) TARGET = can TEMPLATE = app diff --git a/examples/serialbus/modbus/adueditor/adueditor.pro b/examples/serialbus/modbus/adueditor/adueditor.pro index a6a71f6..bba3c0d 100644 --- a/examples/serialbus/modbus/adueditor/adueditor.pro +++ b/examples/serialbus/modbus/adueditor/adueditor.pro @@ -4,6 +4,7 @@ INCLUDEPATH += . TARGET = adueditor QT += serialbus serialport widgets QT += serialbus-private core-private +requires(qtConfig(combobox)) FORMS += interface.ui SOURCES += main.cpp mainwindow.cpp modbustcpclient.cpp diff --git a/examples/serialbus/modbus/master/master.pro b/examples/serialbus/modbus/master/master.pro index 536b559..682ce82 100644 --- a/examples/serialbus/modbus/master/master.pro +++ b/examples/serialbus/modbus/master/master.pro @@ -1,4 +1,5 @@ QT += serialbus serialport widgets +requires(qtConfig(combobox)) TARGET = modbusmaster TEMPLATE = app diff --git a/examples/serialbus/modbus/slave/slave.pro b/examples/serialbus/modbus/slave/slave.pro index edf3e46..b803c5d 100644 --- a/examples/serialbus/modbus/slave/slave.pro +++ b/examples/serialbus/modbus/slave/slave.pro @@ -1,4 +1,5 @@ QT += serialbus serialport widgets +requires(qtConfig(combobox)) TARGET = modbusslave TEMPLATE = app |