diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-11 12:56:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-11 13:29:12 +0200 |
| commit | 2a98afad6eefab6039905f70df7d25537bc5774b (patch) | |
| tree | 974b6863e87a0da86bad55bf9af7e424b57806e5 /src | |
| parent | fb04917e8eb1f7cc5832b2f13ab1d208b0e1014f (diff) | |
| parent | 2433fa45d75cf26add9e7f0ceb8ee439eba68753 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/compiler/qv4compilerscanfunctions.cpp
tools/tools.pro
Done-with: Lars Knoll <lars.knoll@qt.io>
Change-Id: Ia77ee6ede6fc9760ce5a03d68079579a63e5a02f
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/imports.pro | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4compilerscanfunctions.cpp | 6 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 2 | ||||
| -rw-r--r-- | src/quick/configure.json | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index ad33312891..80f493da85 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -25,7 +25,7 @@ qtHaveModule(quick) { qtConfig(quick-particles): \ SUBDIRS += particles - SUBDIRS += shapes + qtConfig(quick-path): SUBDIRS += shapes } qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp index 372e240700..eeb051046b 100644 --- a/src/qml/compiler/qv4compilerscanfunctions.cpp +++ b/src/qml/compiler/qv4compilerscanfunctions.cpp @@ -587,6 +587,12 @@ void ScanFunctions::calcEscapingVariables() auto m = c->members.find(c->caughtVariable); m->canEscape = true; } + const QLatin1String exprForOn("expression for on"); + if (c->contextType == ContextType::Binding && c->name.length() > exprForOn.size() && + c->name.startsWith(exprForOn) && c->name.at(exprForOn.size()).isUpper()) + // we don't really need this for bindings, but we do for signal handlers, and in this case, + // we don't know if the code is a signal handler or not. + c->requiresExecutionContext = true; if (allVarsEscape) { for (auto &m : c->members) m.canEscape = true; diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 8ad4ee8116..e9a2056a61 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -55,7 +55,7 @@ #include <wtf/MathExtras.h> -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) && QT_CONFIG(timezone) /* See QTBUG-56899. Although we don't (yet) have a proper way to reset the system zone, the code below, that uses QTimeZone::systemTimeZone(), works diff --git a/src/quick/configure.json b/src/quick/configure.json index 01617c5395..ab356be557 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -129,6 +129,7 @@ "label": "Path support", "purpose": "Provides Path elements.", "section": "Qt Quick", + "condition": "features.quick-shadereffect", "output": [ "privateFeature" ] |