diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-28 10:25:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-28 10:25:49 +0200 |
| commit | 91cefe7217f706559bd6e42f0946bbfd0dc37186 (patch) | |
| tree | edabe66c79021b813544099f2242f869b766ba52 /examples | |
| parent | 72257654cc6f065f64c9218864e1be5f66738e8a (diff) | |
| parent | f86b2882f9933e7929eae2a9c600a384727f6090 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
examples/mqtt/mqtt.pro
Change-Id: Ic76ff03e314e0d9761ba66372e19f546afcc7d6c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/mqtt/mqtt.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/mqtt/mqtt.pro b/examples/mqtt/mqtt.pro index db620d0..867ca8f 100644 --- a/examples/mqtt/mqtt.pro +++ b/examples/mqtt/mqtt.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ - consolepubsub \ + consolepubsub +qtHaveModule(gui): SUBDIRS += \ simpleclient \ subscriptions |