diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-25 09:40:04 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-25 09:40:04 +0200 |
| commit | b334a92493c9e4956b0fc631610857d1b1cf5f6d (patch) | |
| tree | bdc85d9b49f4b8d666b34e4d87abf629f579f1e2 /src/imports/imports.pro | |
| parent | 0eeb7ada04cc81d0ab1b61747bdf92fd7c33e1ec (diff) | |
| parent | 27079f9168463b5b27aeb2d1f93f867bf714e71a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: If2e7c1cf0f1522f6052bbc3e3636ef62bef1b4db
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 d16ac05669..c03224958c 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 @@ -17,9 +17,9 @@ qtHaveModule(quick) { layouts \ qtquick2 \ window \ - sharedimage \ testlib + qtConfig(systemsemaphore): SUBDIRS += sharedimage qtConfig(quick-particles): \ SUBDIRS += particles } |