diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 14:48:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 12:53:23 +0000 |
| commit | 017350a8a9b4ac866c9b79186bf5a1dd6f6f06ec (patch) | |
| tree | f98070d9bf0bd5659d34355b5eb9647637874187 /src/imports | |
| parent | b361a59c699fca02379c149cf0b9c59490a1ba62 (diff) | |
| parent | 67d1d7843ab5e1c904c8f0f76eadb9fc3f1bbb17 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/jit/qv4assembler.cpp
src/qml/jit/qv4assembler_p.h
src/qml/jit/qv4isel_masm.cpp
src/qml/jsruntime/qv4vme_moth.cpp
Change-Id: I865d794e550a263387a39ca8d051ebf48b70cbc0
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/imports.pro | 4 | ||||
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 2 |
2 files changed, 4 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 } diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 8679750842..40682dd6a8 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -770,6 +770,8 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) } args->setReturnValue(db.asReturnedValue()); +#else + Q_UNUSED(args) #endif // settings } |