diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-13 20:56:01 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-13 20:56:01 +0200 |
| commit | 1fb1c6c4f8769250dffa375e3941738eb1fcc885 (patch) | |
| tree | 4f4c4afae97b54a793a0589f8ca53b7c919de728 /src/imports/imports.pro | |
| parent | d0ce320646b7f852a24f6e0a9e9621ddcedef554 (diff) | |
| parent | 9c1c471e54bb12e8740b76d1c048f2f916a6ab59 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4
Diffstat (limited to 'src/imports/imports.pro')
| -rw-r--r-- | src/imports/imports.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 544993c073..71c05c4b89 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -6,9 +6,9 @@ SUBDIRS += \ builtins \ qtqml \ folderlistmodel \ - localstorage \ models +qtHaveModule(sql): SUBDIRS += localstorage qtConfig(settings): SUBDIRS += settings qtConfig(statemachine): SUBDIRS += statemachine @@ -18,10 +18,10 @@ qtHaveModule(quick) { layouts \ qtquick2 \ window \ - sharedimage \ testlib - qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \ + qtConfig(systemsemaphore): SUBDIRS += sharedimage + qtConfig(quick-particles): \ SUBDIRS += particles } |