Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp

src/plugins/git/clonewizard.cpp

@@ -47,7 +47,7 @@ CloneWizard::CloneWizard(QObject *parent) :
 
 QIcon CloneWizard::icon() const
 {
-    return QIcon();
+    return QIcon(QLatin1String(":/git/images/git.png"));
 }
 
 QString CloneWizard::description() const

src/plugins/git/git.pro

@@ -50,3 +50,6 @@ FORMS += changeselectiondialog.ui \
     stashdialog.ui
 OTHER_FILES += ScmGit.pluginspec
 include(gitorious/gitorious.pri)
+
+RESOURCES += \
+    git.qrc

src/plugins/git/git.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/git">
+        <file>images/git.png</file>
+        <file>images/gitorious.png</file>
+    </qresource>
+</RCC>

src/plugins/git/gitorious/gitoriousclonewizard.cpp

@@ -75,7 +75,7 @@ GitoriousCloneWizard::GitoriousCloneWizard(QObject *parent) :
 
 QIcon GitoriousCloneWizard::icon() const
 {
-    return QIcon();
+    return QIcon(QLatin1String(":/git/images/gitorious.png"));
 }
 
 QString GitoriousCloneWizard::description() const