diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:11:22 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:11:22 +0100 |
| commit | a58f38f1c1ec41d5b886cca6486bf738f71253d1 (patch) | |
| tree | 5db446db30677f1951b63af028ff00d96ac8b702 /examples | |
| parent | 02a4f74cfefd97d88b0b1354be176a4329336004 (diff) | |
| parent | 36fcfe36d720fa5dd3f0a997c565fe3898da715d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I7295292bb7d9b5fc7eba8f099f4592b70de80d11
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bluetooth/bluetooth.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro index e3ef7691..549bb7c6 100644 --- a/examples/bluetooth/bluetooth.pro +++ b/examples/bluetooth/bluetooth.pro @@ -6,4 +6,4 @@ qtHaveModule(widgets) { bttennis } -SUBDIRS += scanner +qtHaveModule(quick): SUBDIRS += scanner |