From fdf94daed26175d7cf1d5abf59acff5437ad68a1 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 20 Jan 2017 13:04:28 +0100 Subject: Doc: reinserted hello.qml which had been deleted by mistake During the update of plugin.cpp this file was deleted by mistake. plugin.cpp still refers to it and it needs to be reinserted in src/quick/doc/snippets. Change-Id: Ie23c926ff6096392da96f0063c767009a3965a30 Reviewed-by: Venugopal Shivashankar --- src/imports/localstorage/plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 6704283cb9..9191700b45 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -581,7 +581,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. -- cgit v1.2.3 From 74ba609f0e1a903ce516b56544916fbd06f5b7a6 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Wed, 22 Feb 2017 13:04:22 +0100 Subject: Fix build for -no-feature-quick-sprite Change-Id: I864b436b7cb1e1fedb15555f53951987dc74012c Reviewed-by: Simon Hausmann --- src/imports/imports.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/imports.pro b/src/imports/imports.pro index c49c05956d..b030cbcf73 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 \ @@ -17,7 +19,7 @@ qtHaveModule(quick) { window \ testlib - qtConfig(opengl(es1|es2)?): \ + qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \ SUBDIRS += particles } -- cgit v1.2.3