Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

6 files changed, 6 insertions, 29 deletions

diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index b5d89be118e..6d709d18f5b 100644
--- a/src/plugins/classview/classview.pro
+++ b/src/plugins/classview/classview.pro
@@ -24,6 +24,3 @@ SOURCES += \
     classviewsymbollocation.cpp \
     classviewtreeitemmodel.cpp \
     classviewutils.cpp
-
-RESOURCES += \
-    classview.qrc
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index d564800f117..bc22d5ce687 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     files: [
-        "classview.qrc",
         "classviewconstants.h",
         "classviewmanager.cpp", "classviewmanager.h",
         "classviewnavigationwidget.cpp", "classviewnavigationwidget.h",
diff --git a/src/plugins/classview/classview.qrc b/src/plugins/classview/classview.qrc
deleted file mode 100644
index 189357bc0be..00000000000
--- a/src/plugins/classview/classview.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/classview">
-        <file>images/hierarchicalmode.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp
index 2499f968c22..bd8d72776a8 100644
--- a/src/plugins/classview/classviewnavigationwidget.cpp
+++ b/src/plugins/classview/classviewnavigationwidget.cpp
@@ -31,6 +31,9 @@
 #include "classviewconstants.h"
 
 #include <coreplugin/find/itemviewfind.h>
+
+#include <cplusplus/Icons.h>
+
 #include <utils/navigationtreeview.h>
 #include <utils/qtcassert.h>
 
@@ -170,7 +173,7 @@ QList<QToolButton *> NavigationWidget::createToolButtons()
         // create a button
         fullProjectsModeButton = new QToolButton();
         fullProjectsModeButton->setIcon(
-                QIcon(QLatin1String(":/classview/images/hierarchicalmode.png")));
+                    CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType));
         fullProjectsModeButton->setCheckable(true);
         fullProjectsModeButton->setToolTip(tr("Show Subprojects"));
 
diff --git a/src/plugins/classview/classviewtreeitemmodel.cpp b/src/plugins/classview/classviewtreeitemmodel.cpp
index 2ce88dc31b1..b00f8e30202 100644
--- a/src/plugins/classview/classviewtreeitemmodel.cpp
+++ b/src/plugins/classview/classviewtreeitemmodel.cpp
@@ -34,21 +34,6 @@
 namespace ClassView {
 namespace Internal {
 
-///////////////////////////////// TreeItemModelPrivate //////////////////////////////////
-
-/*!
-   \class TreeItemModelPrivate
-   \brief The TreeItemModelPrivate class contains private class data for
-   the TreeItemModel class.
-   \sa TreeItemModel
- */
-class TreeItemModelPrivate
-{
-public:
-    //! icon provider
-    CPlusPlus::Icons icons;
-};
-
 ///////////////////////////////// TreeItemModel //////////////////////////////////
 
 /*!
@@ -57,14 +42,12 @@ public:
 */
 
 TreeItemModel::TreeItemModel(QObject *parent)
-    : QStandardItemModel(parent),
-    d(new TreeItemModelPrivate())
+    : QStandardItemModel(parent)
 {
 }
 
 TreeItemModel::~TreeItemModel()
 {
-    delete d;
 }
 
 QVariant TreeItemModel::data(const QModelIndex &index, int role) const
@@ -79,7 +62,7 @@ QVariant TreeItemModel::data(const QModelIndex &index, int role) const
                 bool ok = false;
                 int type = iconType.toInt(&ok);
                 if (ok && type >= 0)
-                    return d->icons.iconForType(static_cast<CPlusPlus::Icons::IconType>(type));
+                    return CPlusPlus::Icons::iconForType(static_cast<CPlusPlus::Icons::IconType>(type));
             }
         }
         break;
diff --git a/src/plugins/classview/images/hierarchicalmode.png b/src/plugins/classview/images/hierarchicalmode.png
deleted file mode 100644
index 88432d2cb10..00000000000
--- a/src/plugins/classview/images/hierarchicalmode.png
+++ /dev/null