diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-07-11 13:01:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 03:38:49 +0200 |
| commit | aa25ad8d5f476d6db59012a122833ebe677eaf69 (patch) | |
| tree | 37eb955dabc252304aefe821d03be5e3857f22c9 /src/quick/util | |
| parent | d64224041efe9febc683cf5ee7155a9cc88058d9 (diff) | |
Make QQmlScriptString opaque.
Allow for future optimization by encapsulating the
raw script data.
Change-Id: I1863103e8e6d74ede60593cabb240e16f2ae657e
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickstatechangescript.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 912a8e34a4..10996d8d2b 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -951,7 +951,7 @@ void QQuickScriptActionPrivate::execute() QQmlScriptString scriptStr = hasRunScriptScript ? runScriptScript : script; - if (!scriptStr.script().isEmpty()) { + if (!scriptStr.isEmpty()) { QQmlExpression expr(scriptStr); expr.evaluate(); if (expr.hasError()) diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index ef894968f5..8ab45761c1 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -130,7 +130,7 @@ void QQuickStateChangeScript::setName(const QString &n) void QQuickStateChangeScript::execute(Reason) { Q_D(QQuickStateChangeScript); - if (!d->script.script().isEmpty()) { + if (!d->script.isEmpty()) { QQmlExpression expr(d->script); expr.evaluate(); if (expr.hasError()) |