Merge lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup into lp:ubuntu-ui-toolkit

[Lars Karlitski]

unitythemeiconprovider: manually load icons

Previously, UnityThemeIconProvider used QIcon::fromTheme() to lookup and load icons. That function uses fdo's default icon lookup algorithm: it looks at the current theme and all parent themes for each icon in turn. We'd prefer a breadth-first search, where all icon names are looked up in the current theme before falling back to the parent themes (see lp: #1324184). This patch implements fdo's FindBestIcon() algorithm, which behaves like that.

It also now properly support rectangular icons and always returns an icon with the requested size (adjusted for preserving the aspect ratio).

unitythemeiconprovider: manually load icons

[lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup]

1215. By Cris Dywan on 2014-08-25

Push Python3 dist-packages to Phone in addition to Python2.7.

Approved by Tim Peeters, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1077
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4002/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3080/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3844/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5253
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12050
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3365/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2134/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

This is looking good from a quick skim, could use some tests though.

[Michał Sawicz (saviq)]

The only problem I see with this is that because "size" does not say whether it's width or height, we'll be using non-optimal images when they are not square. But that can't really be fixed without having amended the FD.o icon theme spec.

[Lars Karlitski (larsu)]

Thanks for looking at this. I've removed the sizing workarounds in the Icon component (so that we can move StatusIcon users to Icon).

> The only problem I see with this is that because "size" does not say whether it's width or height, we'll be using non-optimal images when they are not square.

Right. Let's see if we run into a lot of trouble because of this. If we do, it might be time to amend the fdo spec.

[lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup]

1216. By Cris Dywan on 2014-08-26

Replace off white with pure white. Fixes: https://bugs.launchpad.net/bugs/1354077.

Approved by Tim Peeters, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1078
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4033/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/81/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3867/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5285
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12098
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3388/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2135/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup]

1217. By Cris Dywan on 2014-08-26

Use iconSource for actions in the overflow panel. Fixes: https://bugs.launchpad.net/bugs/1354036, https://bugs.launchpad.net/bugs/1354811.

Approved by PS Jenkins bot, Tim Peeters, Nekhelesh Ramananthan.

1218. By Tim Peeters on 2014-08-26

Add header animations.

Approved by PS Jenkins bot.

1219. By Cris Dywan on 2014-08-26

Update caret visuals and position.

Approved by PS Jenkins bot, Zsombor Egri.

1220. By Florian Boucault on 2014-08-26

Fixed usage of images across the board:

* Made images as small as possible:
  - ListItemDivider6px.png
  - bubble_shadow*.png
  - header_overflow_dropshadow.png
* Removed direct references to @GU in OptionSelector.
* Button's stroke_button.png now loaded only when necessary, asynchronously and not cached.
* Removed unused ListItemDivider24px.png.

Approved by PS Jenkins bot, Zsombor Egri.

1221. By Ugo Riboni on 2014-08-26

Disable the mousearea on top of the content when using the new header, as it is useless and it interferes with other input elements in the content area. Fixes: https://bugs.launchpad.net/bugs/1358327.

Approved by PS Jenkins bot.

1222. By Florian Boucault on 2014-08-27

Page: only compile and load ToolbarItems if strictly necessary.

Approved by Zsombor Egri, PS Jenkins bot.

[Albert Astals Cid (aacid)]

So instead of fixing QIcon we are reimplementing it?

review: Needs Information

[Tim Peeters (tpeeters)]

please branch from lp:ubuntu-ui-toolkit/staging and propose the MR against that branch

review: Needs Resubmitting

[lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup]

1223. By Zsombor Egri on 2014-08-27

Thin divider adjustments.

Approved by Christian Dywan, PS Jenkins bot.

1225. By Lars Karlitski on 2014-08-26

Icon: remove unnecessary sizing workaround

UnityThemeIconProvider behaves correctly now for small icon sizes.

This patch also makes sure that icons are always drawn with the correct aspect
ratio. Consumers only need to supply a height, whereas they needed to set both
width and height.

In the process, the update() function was removed and is thus not called when
the width and height of the Icon changes. This causes no regressions, as Qt
doesn't reload icons with the same url anyway.

1226. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: use qgetenv instead of getenv

1227. By Lars Karlitski on 2014-08-27

tst_components: set XDG_DATA_DIRS so that icons are found

1228. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: don't load icons that might not be used

Only load the icon that has the best matching size, not the ones encountered
while searching for it.

1229. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: support size == -1

Qt sets requestedSize to -1 if no size has been specified. Return the largest
available icon in that case.

1230. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: also return the largest icon when requested size is 0

There's a test and a bug about it. Seems to be expected behavior.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2137/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3430/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2137/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup]

1231. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: use QStandardLocation

1232. By Lars Karlitski on 2014-09-02

Icon10: give source an empty fallback

1233. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: typedef shared IconTheme pointer

Unmerged revisions

1233. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: typedef shared IconTheme pointer

1232. By Lars Karlitski on 2014-09-02

Icon10: give source an empty fallback

1231. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: use QStandardLocation

1230. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: also return the largest icon when requested size is 0

There's a test and a bug about it. Seems to be expected behavior.

1229. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: support size == -1

Qt sets requestedSize to -1 if no size has been specified. Return the largest
available icon in that case.

1228. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: don't load icons that might not be used

Only load the icon that has the best matching size, not the ones encountered
while searching for it.

1227. By Lars Karlitski on 2014-08-27

tst_components: set XDG_DATA_DIRS so that icons are found

1226. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: use qgetenv instead of getenv

1225. By Lars Karlitski on 2014-08-26

Icon: remove unnecessary sizing workaround

UnityThemeIconProvider behaves correctly now for small icon sizes.

This patch also makes sure that icons are always drawn with the correct aspect
ratio. Consumers only need to supply a height, whereas they needed to set both
width and height.

In the process, the update() function was removed and is thus not called when
the width and height of the Icon changes. This causes no regressions, as Qt
doesn't reload icons with the same url anyway.

1224. By Lars Karlitski on 2014-08-25

unitythemeiconprovider: manually load icons

Previously, UnityThemeIconProvider used QIcon::fromTheme() to lookup and load
icons. That function uses fdo's default icon lookup algorithm: it looks at the
current theme and all parent themes for each icon in turn. We'd prefer a
breadth-first search, where all icon names are looked up in the current theme
before falling back to the parent themes (see lp: #1324184). This patch
implements fdo's FindBestIcon() algorithm, which behaves like that.

It also now properly support rectangular icons and always returns an icon with
the requested size (adjusted for preserving the aspect ratio).

=== modified file 'debian/control'
--- debian/control	2014-08-21 04:51:26 +0000
+++ debian/control	2014-08-27 13:55:30 +0000
@@ -27,7 +27,7 @@
                qtdeclarative5-doc-html,
                qtwebkit5-doc-html,
                qtsvg5-doc-html,
-               libqt5svg5,
+               libqt5svg5-dev,
                qtscript5-doc-html,
                qtmultimedia5-doc-html,
                unity-action-doc,

=== modified file 'modules/Ubuntu/Components/Icon10.qml'
--- modules/Ubuntu/Components/Icon10.qml	2014-07-31 14:14:56 +0000
+++ modules/Ubuntu/Components/Icon10.qml	2014-08-27 13:55:30 +0000
@@ -34,42 +34,14 @@
     Image {
         id: image
         objectName: "image"
-        anchors.fill: parent
-
-        /* Necessary so that icons are not loaded before a size is set. */
-        source: ""
-        sourceSize {
-            width: 0
-            height: 0
-        }
-
-        Component.onCompleted: update()
-        onWidthChanged: update()
-        onHeightChanged: update()
-        Connections {
-            target: icon
-            ignoreUnknownSignals: true
-            onNameChanged: image.update()
-            onSourceChanged: image.update()
-        }
-
-        function update() {
-            // only set sourceSize.width, sourceSize.height and source when
-            // icon dimensions are valid, see bug #1349769.
-            if (width > 0 && height > 0
-                    && (icon.name || (icon.hasOwnProperty("source") && icon.source))) {
-                sourceSize.width = width;
-                sourceSize.height = height;
-                if (icon.hasOwnProperty("source")) {
-                    source = icon.source;
-                } else {
-                    source = "image://theme/%1".arg(icon.name);
-                }
-            } else {
-                source = "";
-                sourceSize.width = 0;
-                sourceSize.height = 0;
-            }
+        anchors { top: parent.top; bottom: parent.bottom }
+        fillMode: Image.PreserveAspectFit;
+        sourceSize.height: height
+        source: {
+            if (icon.name)
+                return "image://theme/%1".arg(icon.name);
+            else if (icon.hasOwnProperty("source"))
+                return icon.source;
         }
 
         cache: true

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-08-20 13:03:13 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-08-27 13:55:30 +0000
@@ -5,7 +5,11 @@
 
 TEMPLATE = lib
 TARGET = ../UbuntuComponents
+<<<<<<< TREE
 QT += core-private qml qml-private quick quick-private gui-private dbus
+=======
+QT += core-private qml qml-private quick quick-private dbus svg
+>>>>>>> MERGE-SOURCE
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT += v8-private

=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-03-17 14:24:12 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-08-27 13:55:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2014 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,35 +18,234 @@
 
 #include "unitythemeiconprovider.h"
 
-#include <QIcon>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+#include <QSvgRenderer>
+#include <QPainter>
+#include <QtDebug>
+
+class IconTheme
+{
+public:
+    // Returns the icon theme named @name, creating it if it didn't exist yet.
+    static QSharedPointer<IconTheme> get(const QString &name)
+    {
+        static QHash<QString, QSharedPointer<IconTheme> > themes;
+
+        QSharedPointer<IconTheme> theme = themes[name];
+        if (theme.isNull()) {
+            theme = QSharedPointer<IconTheme>(new IconTheme(name));
+            themes[name] = theme;
+        }
+
+        return theme;
+    }
+
+    // Does a breadth-first search for an icon with any name in @names. Parent
+    // themes are only looked at if the current theme doesn't contain any icon
+    // in @names.
+    QPixmap findBestIcon(const QStringList &names, int size)
+    {
+        Q_FOREACH(const QString &name, names) {
+            QPixmap pixmap = lookupIcon(name, size);
+            if (!pixmap.isNull())
+                return pixmap;
+        }
+
+        Q_FOREACH(QSharedPointer<IconTheme> theme, parents) {
+            QPixmap pixmap = theme->findBestIcon(names, size);
+            if (!pixmap.isNull())
+                return pixmap;
+        }
+
+        return QPixmap();
+    }
+
+private:
+    enum SizeType { Fixed, Scalable, Threshold };
+
+    struct Directory {
+        QString path;
+        SizeType sizeType;
+        int size, minSize, maxSize, threshold;
+    };
+
+    IconTheme(const QString &name): name(name)
+    {
+        Q_FOREACH(const QByteArray &baseDir, qgetenv("XDG_DATA_DIRS").split(':')) {
+            QDir dir(baseDir + "/icons/" + name);
+            if (dir.exists())
+                baseDirs.append(dir.absolutePath());
+        }
+
+        Q_FOREACH(const QString &baseDir, baseDirs) {
+            QString filename = baseDir + "/index.theme";
+            if (QFileInfo::exists(filename)) {
+                QSettings settings(filename, QSettings::IniFormat);
+
+                Q_FOREACH(const QString &path, settings.value("Icon Theme/Directories").toStringList()) {
+                    Directory dir;
+                    dir.path = path;
+                    dir.sizeType = sizeTypeFromString(settings.value(path + "/Type", "Fixed").toString());
+                    dir.size = settings.value(path + "/Size", 32).toInt();
+                    dir.minSize = settings.value(path + "/MinSize", 0).toInt();
+                    dir.maxSize = settings.value(path + "/MaxSize", 0).toInt();
+                    dir.threshold = settings.value(path + "/Threshold", 0).toInt();
+                    directories.append(dir);
+                }
+
+                Q_FOREACH(const QString &name, settings.value("Icon Theme/Inherits").toStringList())
+                    parents.append(IconTheme::get(name));
+
+                // there can only be one index.theme
+                break;
+            }
+        }
+    }
+
+    SizeType sizeTypeFromString(const QString &string)
+    {
+        if (string == "Fixed")
+            return Fixed;
+        if (string == "Scalable")
+            return Scalable;
+        if (string == "Threshold")
+            return Threshold;
+        qWarning() << "IconTheme: unknown size type '" << string << "'. Assuming 'Fixed'.";
+        return Fixed;
+    }
+
+    static QPixmap loadIcon(const QString &filename, int size)
+    {
+        QPixmap pixmap;
+
+        if (filename.endsWith(".png")) {
+            pixmap = QPixmap(filename);
+            if (!pixmap.isNull() && size > 0 && (pixmap.width() != size || pixmap.height() != size))
+                pixmap = pixmap.scaled(size, size, Qt::KeepAspectRatioByExpanding);
+        }
+        else if (filename.endsWith(".svg")) {
+            QSvgRenderer renderer(filename);
+            pixmap = QPixmap(renderer.defaultSize().scaled(size, size, Qt::KeepAspectRatioByExpanding));
+            pixmap.fill(Qt::transparent);
+            QPainter painter(&pixmap);
+            renderer.render(&painter);
+            painter.end();
+        }
+
+        return pixmap;
+    }
+
+    QString lookupIconFile(const QString &dir, const QString &name)
+    {
+        QString png = QString("%1/%2.png").arg(dir).arg(name);
+        QString svg = QString("%1/%2.svg").arg(dir).arg(name);
+
+        Q_FOREACH(const QString &baseDir, baseDirs) {
+            QString filename = baseDir + "/" + png;
+            if (QFileInfo::exists(filename))
+                return filename;
+
+            filename = baseDir + "/" + svg;
+            if (QFileInfo::exists(filename))
+                return filename;
+        }
+
+        return QString();
+    }
+
+    QPixmap lookupIcon(const QString &iconName, int size)
+    {
+        if (size > 0)
+            return lookupBestMatchingIcon(iconName, size);
+        else
+            return lookupLargestIcon(iconName);
+    }
+
+    QPixmap lookupBestMatchingIcon(const QString &iconName, int size)
+    {
+        int minDistance = 10000;
+        QString bestFilename;
+
+        Q_FOREACH(const Directory &dir, directories) {
+            int dist = directorySizeDistance(dir, size);
+            if (dist >= minDistance)
+                continue;
+
+            QString filename = lookupIconFile(dir.path, iconName);
+            if (!filename.isNull()) {
+                minDistance = dist;
+                bestFilename = filename;
+
+                // bail out early if we can't get a better size match
+                if (minDistance == 0)
+                    break;
+            }
+        }
+
+        if (!bestFilename.isNull())
+            return loadIcon(bestFilename, size);
+
+        return QPixmap();
+    }
+
+    QPixmap lookupLargestIcon(const QString &iconName)
+    {
+        int maxSize = 0;
+        QString bestFilename;
+
+        Q_FOREACH(const Directory &dir, directories) {
+            int size = dir.sizeType == Scalable ? dir.maxSize : dir.size;
+            if (size < maxSize)
+                continue;
+
+            QString filename = lookupIconFile(dir.path, iconName);
+            if (!filename.isNull()) {
+                maxSize = size;
+                bestFilename = filename;
+            }
+        }
+
+        if (!bestFilename.isNull())
+            return loadIcon(bestFilename, maxSize);
+
+        return QPixmap();
+    }
+
+    int directorySizeDistance(const Directory &dir, int size)
+    {
+        switch (dir.sizeType) {
+            case Fixed:
+                return qAbs(size - dir.size);
+
+            case Scalable:
+                return qAbs(size - qBound(dir.minSize, size, dir.maxSize));
+
+            case Threshold:
+                return qAbs(size - qBound(dir.size - dir.threshold, size, dir.size + dir.threshold));
+
+            default:
+                return 10000;
+        }
+    }
+
+    QString name;
+    QStringList baseDirs;
+    QList<Directory> directories;
+    QList<QSharedPointer<IconTheme> > parents;
+};
 
 UnityThemeIconProvider::UnityThemeIconProvider():
   QQuickImageProvider(QQuickImageProvider::Pixmap)
 {
-    QIcon::setThemeName("suru");
+    theme = IconTheme::get("suru");
 }
 
-QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *realSize, const QSize &requestedSize)
+QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    QIcon icon;
-
-    Q_FOREACH (const QString &name, id.split(",", QString::SkipEmptyParts)) {
-        icon = QIcon::fromTheme(name);
-        if (!icon.isNull()) {
-            if (requestedSize.isValid()) {
-                *realSize =requestedSize;
-                return icon.pixmap(requestedSize);
-            } else {
-                QList<QSize> sizes = icon.availableSizes();
-                if (sizes.count() > 0 && sizes.last().isValid()) {
-                    *realSize = sizes.last();
-                } else {
-                    *realSize = QSize(32,32);
-                }
-                return icon.pixmap(*realSize);
-            }
-            break;
-        }
-    }
-    return QPixmap();
+    int iconSize = qMax(requestedSize.width(), requestedSize.height());
+    QPixmap pixmap = theme->findBestIcon(id.split(",", QString::SkipEmptyParts), iconSize);
+    *size = pixmap.size();
+    return pixmap;
 }

=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.h'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	2013-08-07 16:13:39 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	2014-08-27 13:55:30 +0000
@@ -26,6 +26,9 @@
 public:
     UnityThemeIconProvider();
     QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
+
+private:
+    QSharedPointer<class IconTheme> theme;
 };
 
 #endif

=== modified file 'tests/unit_x11/tst_components/tst_components.cpp'
--- tests/unit_x11/tst_components/tst_components.cpp	2013-11-26 12:44:39 +0000
+++ tests/unit_x11/tst_components/tst_components.cpp	2014-08-27 13:55:30 +0000
@@ -25,7 +25,18 @@
     Register()
     {
         qmlRegisterType<TabsModel>("TestObjects", 0, 1, "TabsModel");
-    }
+
+        savedDataDirs = qgetenv("XDG_DATA_DIRS");
+        qputenv("XDG_DATA_DIRS", "/usr/share");
+    }
+
+    ~Register()
+    {
+        qputenv("XDG_DATA_DIRS", savedDataDirs);
+    }
+
+private:
+    QByteArray savedDataDirs;
 };
 
 Register r;

=== modified file 'tests/unit_x11/tst_components/tst_icon.qml'
--- tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 20:20:49 +0000
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-08-27 13:55:30 +0000
@@ -82,7 +82,7 @@
 
             var image = findChild(icon2, "image");
             compare(image.source,
-                    "file:///usr/share/icons/suru/actions/scalable/search.svg",
+                    "image://theme/search",
                     "Source of the image should equal icon2.source.");
         }
     }