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/cvs/checkoutwizard.cpp

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

src/plugins/cvs/cvs.qrc

@@ -1,5 +1,8 @@
 <RCC>
-    <qresource prefix="/trolltech.cvs" >
+    <qresource prefix="/trolltech.cvs">
         <file>CVS.mimetypes.xml</file>
     </qresource>
+    <qresource prefix="/cvs">
+        <file>images/cvs.png</file>
+    </qresource>
 </RCC>