Merge remote branch 'origin/2.1'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp

tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

@@ -57,6 +57,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QFont>
 #include <QtGui/QLabel>
+//#include <QtGui/private/qfixed_p.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPainterPath>
 #include <QtGui/QRegion>
@@ -454,7 +455,21 @@ QFileInfo testQFileInfo()
     s = fi.bundleName();
     s = fi.bundleName();
     s = fi.bundleName();
-    return fi;
+
+    QFileInfo result("/tmp/t");
+    return result;
+}
+
+void testQFixed()
+{
+/*
+    QFixed f = QFixed::fromReal(4.2);
+    f += 1;
+    f += 1;
+    f *= -1;
+    f += 1;
+    f += 1;
+*/
 }
 
 QHash<int, float> testQHash()
@@ -509,7 +524,8 @@ QHash<int, float> testQHash()
     hash.insert("Welt", QPointer<QObject>(&ob));
     hash.insert(".", QPointer<QObject>(&ob));
 #endif
-    return hgg0;
+    QHash<int, float> result;
+    return result;
 }
 
 void testQImage()
@@ -1118,7 +1134,8 @@ std::list<int> testStdList()
     vec.push_back(true);
     vec.push_back(false);
 #endif
-    return big;
+    std::list<int> result;
+    return result;
 }
 
 void testStdMap()
@@ -1193,7 +1210,8 @@ std::set<int> testStdSet()
     std::set<QPointer<QObject> > hash;
     QPointer<QObject> ptr(&ob);
 #endif
-    return hgg0;
+    std::set<int> result;
+    return result;
 }
 
 std::stack<int> testStdStack()
@@ -1219,7 +1237,8 @@ std::stack<int> testStdStack()
     flist.push(1);
     flist.push(2);
 
-    return flist2;
+    std::stack<int> result;
+    return result;
 }
 
 std::string testStdString()
@@ -1259,7 +1278,8 @@ std::string testStdString()
     v.push_back(str);
     v.push_back(str);
 
-    return str;
+    std::string result = "hi";
+    return result;
 }
 
 void testStdVector()
@@ -1343,7 +1363,8 @@ QStack<int> testQStack()
     QStack<bool> vec;
     vec.append(true);
     vec.append(false);
-    return big;
+    QStack<int> result;
+    return result;
 }
 
 void testQString()
@@ -1386,7 +1407,8 @@ QStringList testQStringList()
     l << " fat ";
     l.takeFirst();
     l << " World ";
-    return l;
+    QStringList result;
+    return result;
 }
 
 Foo testStruct()
@@ -1504,7 +1526,8 @@ QVariant testQVariant2()
     var.setValue(my);
     var.setValue(my);
 #endif
-    return QVariant("sss");
+    QVariant result("sss");
+    return result;
 }
 
 QVariant testQVariant3()
@@ -1522,7 +1545,9 @@ QVariant testQVariant3()
     QVariant variant = qVariantFromValue(list);
     list.clear();
     list = qVariantValue<QList<int> >(variant);
-    return QVariant("xxx");
+
+    QVariant result("xxx");
+    return result;
 }
 
 void testQVector()
@@ -2019,6 +2044,7 @@ int main(int argc, char *argv[])
     testQDateTime();
     testQTime();
     testQFileInfo();
+    testQFixed();
     testObject1();
     testVector1();
     testQHash1();