diff options
| author | Robin Burchell <robin+qt@viroteck.net> | 2012-06-23 09:34:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 09:46:01 +0200 |
| commit | b2ff9d346caffa8a6334ab726412b72a1dd1077c (patch) | |
| tree | 85e45a3c599310117bbf551624ce0d3e98a0c2f2 /src/quick/items/qquickborderimage.cpp | |
| parent | a5186a23330ff42b79c121b565e5880ce63856aa (diff) | |
Checking for QUrl equality is not all that expensive, so remove hack.
QUrl's operator== used to perform allocations by comparing normalized URLs, but
even then, this code seemingly would not apply: Qt 4's QUrl still has a fast
path for the case where the URLs are empty, the same as this code implemented.
Change-Id: I69e82c848f47f5e5660bd707bfba0ff7343c8a42
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
| -rw-r--r-- | src/quick/items/qquickborderimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 87d423f320..abd20c66f0 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -274,8 +274,8 @@ QQuickBorderImage::~QQuickBorderImage() void QQuickBorderImage::setSource(const QUrl &url) { Q_D(QQuickBorderImage); - //equality is fairly expensive, so we bypass for simple, common case - if ((d->url.isEmpty() == url.isEmpty()) && url == d->url) + + if (url == d->url) return; if (d->sciReply) { |