Merge remote branch 'origin/2.1'

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc share/qtcreator/templates/qmlapp/app.pro
index 8cfa591,c27c04e..65afd99
--- 1/share/qtcreator/templates/qmlapp/app.pro
--- 2/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@@ -20,17 -20,9 +20,16 @@@ DEFINES += NETWORKACCES
  # TARGETUID3 #
  symbian:TARGET.UID3 = 0xE1111234
  
- # Define QMLJSDEBUGGER to enable basic debugging (setting breakpoints etc)
- # Define QMLOBSERVER for advanced features (requires experimental QmlInspector plugin!)
- #DEFINES += QMLJSDEBUGGER
- #DEFINES += QMLOBSERVER
 +# Smart Installer package's UID
 +# This UID is from the protected range 
 +# and therefore the package will fail to install if self-signed
 +# By default qmake uses the unprotected range value if unprotected UID is defined for the application
 +# and 0x2002CCCF value if protected UID is given to the application
 +#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
 +
+ # Define QMLJSDEBUGGER to allow debugging of QML
+ # (This might significantly increase build time)
+ # DEFINES += QMLJSDEBUGGER
  
  # The .cpp file which was generated for your project. Feel free to hack it.
  SOURCES += main.cpp

diff --cc src/plugins/debugger/debuggerengine.cpp
Simple merge

diff --cc src/plugins/debugger/gdb/gdbengine.cpp
Simple merge

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

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

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

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

diff --cc src/plugins/qt4projectmanager/qtversionmanager.h
Simple merge

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