Merge remote branch 'origin/2.0'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.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/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/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/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.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/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec

diff --cc src/plugins/coreplugin/filemanager.cpp
Simple merge

diff --cc src/plugins/cvs/cvsplugin.cpp
Simple merge

diff --cc src/plugins/fakevim/fakevimhandler.cpp
Simple merge

diff --cc src/plugins/git/gitclient.cpp
Simple merge

diff --cc src/plugins/mercurial/mercurialclient.cpp
Simple merge

diff --cc src/plugins/perforce/perforceplugin.cpp
Simple merge

diff --cc src/plugins/projectexplorer/projectexplorer.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt4nodes.cpp
Simple merge

diff --cc src/plugins/subversion/subversionplugin.cpp
Simple merge

diff --cc src/plugins/texteditor/basetexteditor.cpp
Simple merge

diff --cc src/plugins/vcsbase/vcsbaseeditor.cpp
Simple merge

diff --cc src/shared/proparser/profileevaluator.cpp
index a7ad13b,b478890..c33069b
--- 1/src/shared/proparser/profileevaluator.cpp
--- 2/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@@ -2139,20 -1395,32 +2157,29 @@@ ProFileEvaluator::Private::VisitReturn 
  
                  evaluateFeatureFile(QLatin1String("default_pre.prf"),
                                      &m_option->base_valuemap, &m_option->base_functions);
+ 
+ #ifdef PROEVALUATOR_THREAD_SAFE
+                 locker.relock();
+                 m_option->base_inProgress = false;
+                 m_option->cond.wakeAll();
+ #endif
              }
+ #ifdef PROEVALUATOR_THREAD_SAFE
+           }
+ #endif
  
              m_valuemapStack.top() = m_option->base_valuemap;
 -
 -            clearFunctions(&m_functionDefs);
              m_functionDefs = m_option->base_functions;
 -            refFunctions(&m_functionDefs.testFunctions);
 -            refFunctions(&m_functionDefs.replaceFunctions);
  
 -            QStringList &tgt = m_valuemapStack.top()[QLatin1String("TARGET")];
 +            ProStringList &tgt = m_valuemapStack.top()[ProString("TARGET")];
              if (tgt.isEmpty())
 -                tgt.append(QFileInfo(pro->fileName()).baseName());
 +                tgt.append(ProString(QFileInfo(pro->fileName()).baseName(), NoHash));
  
 -            QStringList &tmp = m_valuemapStack.top()[QLatin1String("CONFIG")];
 -            tmp.append(m_addUserConfigCmdArgs);
 +            ProStringList &tmp = m_valuemapStack.top()[ProString("CONFIG")];
 +            foreach (const QString &add, m_addUserConfigCmdArgs)
 +                tmp.append(ProString(add, NoHash));
              foreach (const QString &remove, m_removeUserConfigCmdArgs)
 -                tmp.removeAll(remove);
 +                removeAll(&tmp, ProString(remove, NoHash));
          }
      }
  

diff --cc src/shared/proparser/profileevaluator.h
Simple merge