diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 10:14:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 11:48:14 +0100 |
| commit | b1fa22c1683d9f6cedb001f5ef8a0dac71868935 (patch) | |
| tree | c30a114c75be071310df974283b928329f9d5c12 /src/imports | |
| parent | ba68c325688acf3072715757480497524f61c425 (diff) | |
| parent | fe5d69669197a51662061b014810f0242eec5ca7 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/quick/accessible/qaccessiblequickview_p.h
src/quick/items/qquickmousearea.cpp
src/quick/util/qquickanimatorjob.cpp
tools/qmlplugindump/main.cpp
Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
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 20ade45fc8..45719df874 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += quick-private + SUBDIRS += \ builtins \ qtqml \ @@ -18,7 +20,7 @@ qtHaveModule(quick) { sharedimage \ testlib - qtConfig(opengl(es1|es2)?): \ + qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \ SUBDIRS += particles } diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 60b8dad5fb..8679750842 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -564,7 +564,7 @@ Database connections are automatically closed during Javascript garbage collecti The API can be used from JavaScript functions in your QML: -\snippet localstorage/localstorage/hello.qml 0 +\snippet qml/localstorage/hello.qml 0 The API conforms to the Synchronous API of the HTML5 Web Database API, \link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink. |