Merge lp:~fboucault/unity-2d/dash_thumb_respect_ratio into lp:unity-2d/3.0

[Florian Boucault]

[dash] IconImageProvider: preserve the aspect ratio when loading the icon.

=== modified file 'libunity-2d-private/src/iconimageprovider.cpp'
--- libunity-2d-private/src/iconimageprovider.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/iconimageprovider.cpp	2011-08-23 17:36:17 +0000
@@ -68,7 +68,7 @@
         }
 
         if (requestedSize.isValid()) {
-            icon = icon.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+            icon = icon.scaled(requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         }
 
         if (size) {