diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-25 13:27:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-25 13:27:14 +0200 |
| commit | a3880c4916cce1fac2c033ef291a83a887accdc6 (patch) | |
| tree | 6a5bc23823edd3b645a63f48f059460aa6dc51c1 /src/plugins/resourceeditor | |
| parent | 452ea6a662a62e44081ea93434128b4e094db7cc (diff) | |
| parent | 728229690af3a5357c59790b58e10e9edddb3756 (diff) | |
| download | qt-creator-a3880c4916cce1fac2c033ef291a83a887accdc6.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667
Diffstat (limited to 'src/plugins/resourceeditor')
| -rw-r--r-- | src/plugins/resourceeditor/images/qt_qrc.png | bin | 590 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/resourceeditor/qrceditor/resourcefile.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditor.qrc | 1 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditorfactory.cpp | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/resourceeditor/images/qt_qrc.png b/src/plugins/resourceeditor/images/qt_qrc.png Binary files differdeleted file mode 100644 index 2b0fea7503..0000000000 --- a/src/plugins/resourceeditor/images/qt_qrc.png +++ /dev/null diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index ef15fe6660..d034a0556c 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -30,6 +30,7 @@ #include <coreplugin/icore.h> #include <coreplugin/removefiledialog.h> #include <coreplugin/vcsmanager.h> +#include <projectexplorer/projectexplorerconstants.h> #include <utils/fileutils.h> #include <QCoreApplication> @@ -547,7 +548,7 @@ ResourceModel::ResourceModel(QObject *parent) : QAbstractItemModel(parent), m_dirty(false) { m_prefixIcon = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon, - QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QSize(16, 16)); + QIcon(QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QRC)), QSize(16, 16)); } void ResourceModel::setDirty(bool b) diff --git a/src/plugins/resourceeditor/resourceeditor.qrc b/src/plugins/resourceeditor/resourceeditor.qrc index 2a1816f1cb..9d6b792e03 100644 --- a/src/plugins/resourceeditor/resourceeditor.qrc +++ b/src/plugins/resourceeditor/resourceeditor.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/resourceeditor"> - <file>images/qt_qrc.png</file> <file>ResourceEditor.mimetypes.xml</file> </qresource> </RCC> diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index de7c80d82e..d4707e3f69 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -30,6 +30,7 @@ #include <coreplugin/fileiconprovider.h> #include <coreplugin/editormanager/editormanager.h> +#include <projectexplorer/projectexplorerconstants.h> #include <QCoreApplication> #include <QFileInfo> @@ -46,7 +47,8 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) : setMimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE))); setDisplayName(qApp->translate("OpenWith::Editors", C_RESOURCEEDITOR_DISPLAY_NAME)); - Core::FileIconProvider::registerIconOverlayForSuffix(":/resourceeditor/images/qt_qrc.png", "qrc"); + Core::FileIconProvider::registerIconOverlayForSuffix( + ProjectExplorer::Constants::FILEOVERLAY_QRC, "qrc"); } Core::IEditor *ResourceEditorFactory::createEditor() |
