Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7

tests/manual/debugger/simple/simple_test_app.cpp

@@ -3592,9 +3592,9 @@ namespace qurl {
 
     void testQUrl()
     {
-        QUrl url(QString("http://www.nokia.com"));
+        QUrl url(QString("http://qt-project.org"));
         BREAK_HERE;
-        // Check url "http://www.nokia.com" QUrl.
+        // Check url "http://qt-project.org" QUrl.
         // Continue.
         dummyStatement(&url);
     }