diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
| commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
| tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/imports/imports.pro | |
| parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
| parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/imports/imports.pro')
| -rw-r--r-- | src/imports/imports.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 7d5596e86e..0d84bf538f 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -5,10 +5,10 @@ SUBDIRS += \ qtqml \ folderlistmodel \ localstorage \ - models \ - statemachine + models qtConfig(settings): SUBDIRS += settings +qtConfig(statemachine): SUBDIRS += statemachine qtHaveModule(quick) { SUBDIRS += \ |