Merge branch 'mart/configurableIconSize'

Authored by mart.

Description

Merge branch 'mart/configurableIconSize'

Conflicts:
shell/widgetsexplorer/package/contents/ui/ResourceBrowser.qml

Merged Changes

CommitAuthorDetailsCommitted
e57662758ffemart
64 pixels default desktop icons 
Feb 20 2012
48440cf0f711mart
Merge branch 'master' into mart/configurableIconSize 
Feb 20 2012
7858dfecda2dmart
sync icon sizes with defaultIconSize 
Feb 20 2012
131cf7be8671mart
global property to influence icon size 
Feb 17 2012
4ffcb25f2a83mart
dynamic photo thumbnail margins 
Feb 17 2012
eff9dc83ade9mart
remove unused stuff 
Feb 17 2012
9c149e5c0feamart
fix sizing for images and bookmarks as well 
Feb 17 2012
5daca8e3cc80mart
icon size depends from delegate width 
Feb 17 2012
d6b8aecea606mart
simplify delegates 
Feb 17 2012