Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f

9 files changed, 0 insertions, 119 deletions

diff --git a/src/shared/proparser/images/append.png b/src/shared/proparser/images/append.png
deleted file mode 100644
index 5ae826e56c..0000000000
--- a/src/shared/proparser/images/append.png
+++ /dev/null
diff --git a/src/shared/proparser/images/other.png b/src/shared/proparser/images/other.png
deleted file mode 100644
index 044ce1ebb8..0000000000
--- a/src/shared/proparser/images/other.png
+++ /dev/null
diff --git a/src/shared/proparser/images/profile.png b/src/shared/proparser/images/profile.png
deleted file mode 100644
index 4a24ce3c2f..0000000000
--- a/src/shared/proparser/images/profile.png
+++ /dev/null
diff --git a/src/shared/proparser/images/remove.png b/src/shared/proparser/images/remove.png
deleted file mode 100644
index 039f05a005..0000000000
--- a/src/shared/proparser/images/remove.png
+++ /dev/null
diff --git a/src/shared/proparser/images/scope.png b/src/shared/proparser/images/scope.png
deleted file mode 100644
index eefcb59954..0000000000
--- a/src/shared/proparser/images/scope.png
+++ /dev/null
diff --git a/src/shared/proparser/images/set.png b/src/shared/proparser/images/set.png
deleted file mode 100644
index 69a8fe0523..0000000000
--- a/src/shared/proparser/images/set.png
+++ /dev/null
diff --git a/src/shared/proparser/images/value.png b/src/shared/proparser/images/value.png
deleted file mode 100644
index 433cd527f4..0000000000
--- a/src/shared/proparser/images/value.png
+++ /dev/null
diff --git a/src/shared/proparser/proiteminfo.xml b/src/shared/proparser/proiteminfo.xml
deleted file mode 100644
index 0224bb166d..0000000000
--- a/src/shared/proparser/proiteminfo.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE ProItemInfo>
-<proiteminfo>
- <scope>
-  <id>win32</id>
-  <name>Windows</name>
- </scope>
-
- <scope>
-  <id>unix</id>
-  <name>Unix</name>
- </scope>
-
- <scope>
-  <id>mac</id>
-  <name>Mac</name>
- </scope>
-
- <variable multiple="false">
-  <id>TARGET</id>
-  <name>Output Target</name>
-  <description>This specifies the name of the target file.</description>
- </variable>
-
- <variable multiple="false">
-  <id>TEMPLATE</id>
-  <name>Output Template</name>
-  <description>This variable contains the name of the template to use when generating the project.</description>
-  <value>
-    <id>app</id>
-    <name>Application</name>
-  </value>
-  <value>
-    <id>lib</id>
-    <name>Library</name>
-  </value>
-  <value>
-    <id>subdirs</id>
-    <name>Subdirectories</name>
-  </value>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>HEADERS</id>
-  <name>Header Files</name>
-  <description>Defines the header files for the project</description>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>SOURCES</id>
-  <name>Source Files</name>
-  <description>Defines the source files for the project</description>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>INCLUDEPATH</id>
-  <name>Include Path</name>
-  <description>Defines the include path for the project</description>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>FORMS</id>
-  <name>Form Files</name>
-  <description>Defines the form files for the project</description>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>RESOURCES</id>
-  <name>Resource Files</name>
-  <description>Defines the resource files for the project</description>
- </variable>
-
- <variable multiple="true" operator="0">
-  <id>QT</id>
-  <name>Qt Modules</name>
-  <description>The values stored in the QT variable control which of the Qt modules are used by your project.</description>
-  <value>
-    <id>core</id>
-    <name>QtCore module</name>
-  </value>
-  <value>
-    <id>gui</id>
-    <name>QtGui module</name>
-  </value>
-  <value>
-    <id>network</id>
-    <name>QtNetwork module</name>
-  </value>
-  <value>
-    <id>opengl</id>
-    <name>QtOpenGL module</name>
-  </value>
-  <value>
-    <id>sql</id>
-    <name>QtSql module</name>
-  </value>
-  <value>
-    <id>svg</id>
-    <name>QtSvg module</name>
-  </value>
-  <value>
-    <id>xml</id>
-    <name>QtXml module</name>
-  </value>
-  <value>
-    <id>qt3support</id>
-    <name>Qt3Support module</name>
-  </value>
- </variable>
-</proiteminfo>
diff --git a/src/shared/proparser/proparser.qrc b/src/shared/proparser/proparser.qrc
index ab5a8a720d..9193eaa31c 100644
--- a/src/shared/proparser/proparser.qrc
+++ b/src/shared/proparser/proparser.qrc
@@ -1,14 +1,4 @@
 <RCC>
-    <qresource prefix="/proparser" >
-        <file>images/profile.png</file>
-        <file>images/scope.png</file>
-        <file>images/value.png</file>
-        <file>images/other.png</file>
-        <file>images/set.png</file>
-        <file>images/append.png</file>
-        <file>images/remove.png</file>
-        <file>proiteminfo.xml</file>
-    </qresource>
     <qresource prefix="/qmake/features" >
         <file>spec_pre.prf</file>
         <file>spec_post.prf</file>