Merge remote branch 'origin/2.1'

Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc share/qtcreator/templates/mobileapp/app.pro
index b8cc1c5,9936500..a832c6b
--- 1/share/qtcreator/templates/mobileapp/app.pro
--- 2/share/qtcreator/templates/mobileapp/app.pro
+++ b/share/qtcreator/templates/mobileapp/app.pro
@@@ -15,15 -15,6 +15,13 @@@ DEFINES += NETWORKACCES
  # TARGETUID3 #
  symbian:TARGET.UID3 = 0xE1111234
  
- symbian:ICON = symbianicon.svg
- 
 +# 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
 +
  SOURCES += main.cpp mainwindow.cpp
  HEADERS += mainwindow.h
  FORMS += mainwindow.ui

diff --cc share/qtcreator/templates/qmlapp/app.pro
index 9d119f7,cb0abcb..8cfa591
--- 1/share/qtcreator/templates/qmlapp/app.pro
--- 2/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@@ -20,15 -20,6 +20,13 @@@ DEFINES += NETWORKACCES
  # TARGETUID3 #
  symbian:TARGET.UID3 = 0xE1111234
  
- symbian:ICON = symbianicon.svg
- 
 +# 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 enable basic debugging (setting breakpoints etc)
  # Define QMLOBSERVER for advanced features (requires experimental QmlInspector plugin!)
  #DEFINES += QMLJSDEBUGGER

diff --cc src/plugins/cpptools/cpptools.pro
index 04d10bc,8062333..be6a5cf
--- 1/src/plugins/cpptools/cpptools.pro
--- 2/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@@ -26,7 -26,8 +26,9 @@@ HEADERS += completionsettingspage.h 
      cppfindreferences.h \
      cppcodeformatter.h \
      symbolsfindfilter.h \
-     uicodecompletionsupport.h
++    uicodecompletionsupport.h \
+     insertionpointlocator.h \
+     cpprefactoringchanges.h
  
  SOURCES += completionsettingspage.cpp \
      cppclassesfilter.cpp \
@@@ -44,7 -45,8 +46,9 @@@
      cppfindreferences.cpp \
      cppcodeformatter.cpp \
      symbolsfindfilter.cpp \
-     uicodecompletionsupport.cpp
++    uicodecompletionsupport.cpp \
+     insertionpointlocator.cpp \
+     cpprefactoringchanges.cpp
  
  FORMS += completionsettingspage.ui \
      cppfilesettingspage.ui

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

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

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

diff --cc src/plugins/debugger/qml/qmlengine.cpp
Simple merge

diff --cc src/plugins/debugger/qml/qmlengine.h
Simple merge

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

diff --cc src/plugins/plugins.pro
Simple merge

diff --cc src/plugins/qt4projectmanager/wizards/mobileapp.cpp
Simple merge

diff --cc tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Simple merge