aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-04-10 15:17:36 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-04-16 17:14:20 +0000
commit61f218b4e772c1d97e32ef8031de0043473ebbef (patch)
tree3e3cb0fb11c338bef3595de027a31eb95a73f545 /src/quick
parent496ddbfd1fe27bdddf5c15cd0ea70df452a3ec04 (diff)
Speed up object creation
Avoid copying url and file name twice into the context every time we instantiate an object. Change-Id: I1c76b80b9c44f95512af5899d760151f6dcd7bb5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickwindowmodule.cpp4
-rw-r--r--src/quick/util/qquickpropertychanges.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index 414f068285..5c66a2ef84 100644
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -143,9 +143,9 @@ void QQuickWindowQmlImpl::setWindowVisibility()
error.setObject(this);
const QQmlContextData* urlContext = data->context;
- while (urlContext && urlContext->url.isEmpty())
+ while (urlContext && urlContext->url().isEmpty())
urlContext = urlContext->parent;
- error.setUrl(urlContext ? urlContext->url : QUrl());
+ error.setUrl(urlContext ? urlContext->url() : QUrl());
QString objectId = data->context->findObjectId(this);
if (!objectId.isEmpty())
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 4e96d90fde..6c333c6b13 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -295,8 +295,8 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix,
int column = -1;
QQmlData *ddata = QQmlData::get(q);
- if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
- url = ddata->outerContext->url;
+ if (ddata && ddata->outerContext && !ddata->outerContext->url().isEmpty()) {
+ url = ddata->outerContext->url();
line = ddata->lineNumber;
column = ddata->columnNumber;
}