diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
| commit | 0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch) | |
| tree | 28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/imports/imports.pro | |
| parent | 12a3eff085bc7eb30a5283e32009d2899b464278 (diff) | |
| parent | a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff) | |
Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler
We no longer have any hope of getting this into 5.8.
Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
Diffstat (limited to 'src/imports/imports.pro')
| -rw-r--r-- | src/imports/imports.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 28345d049a..7d5596e86e 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -6,9 +6,10 @@ SUBDIRS += \ folderlistmodel \ localstorage \ models \ - settings \ statemachine +qtConfig(settings): SUBDIRS += settings + qtHaveModule(quick) { SUBDIRS += \ handlers \ |