feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667
This commit is contained in:
Eike Ziller
2016-04-25 13:27:09 +02:00
parent 452ea6a662 728229690a
commit a3880c4916
60 changed files with 451 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -809,7 +809,7 @@ bool QbsProjectNode::showInSimpleTree() const
void QbsProjectNode::ctor()
{
if (m_projectIcon.isNull())
m_projectIcon = generateIcon(QString::fromLatin1(QtSupport::Constants::ICON_QT_PROJECT));
m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT));
setIcon(m_projectIcon);
addFileNodes(QList<ProjectExplorer::FileNode *>()

2
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -94,7 +94,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs");
Core::FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QT, "qbs");
//create and register objects
addAutoReleasedObject(new QbsManager);