Merge remote branch 'origin/2.1'

Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/debugger/debuggeractions.cpp

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc share/qtcreator/templates/mobileapp/app.pro
index 3e62a19,5c1eacc..ecff9d5
--- 1/share/qtcreator/templates/mobileapp/app.pro
--- 2/share/qtcreator/templates/mobileapp/app.pro
+++ b/share/qtcreator/templates/mobileapp/app.pro
@@@ -7,21 -7,10 +7,17 @@@ DEPLOYMENTFOLDERS = # file1 dir
  # TARGETUID3 #
  symbian:TARGET.UID3 = 0xE1111234
  
 +# 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
 +
+ # Allow network access on Symbian
+ # NETWORKACCESS #
+ symbian:TARGET.CAPABILITY += NetworkServices
+ 
  # If your application uses the Qt Mobility libraries, uncomment
  # the following lines and add the respective components to the 
  # MOBILITY variable. 

diff --cc share/qtcreator/templates/mobileapp/mainwindow.cpp
Simple merge

diff --cc share/qtcreator/templates/qmlapp/app.pro
index 5b43467,1ba2bce..bf48f9b
--- 1/share/qtcreator/templates/qmlapp/app.pro
--- 2/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@@ -12,21 -12,10 +12,17 @@@ QML_IMPORT_PATH 
  # TARGETUID3 #
  symbian:TARGET.UID3 = 0xE1111234
  
 +# 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
 +
+ # Allow network access on Symbian
+ # NETWORKACCESS #
+ symbian:TARGET.CAPABILITY += NetworkServices
+ 
  # Define QMLJSDEBUGGER to allow debugging of QML in debug builds
  # (This might significantly increase build time)
  # DEFINES += QMLJSDEBUGGER

diff --cc share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
Simple merge

diff --cc share/qtcreator/templates/shared/deployment.pri
Simple merge

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

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