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

QmlDesigner: fix showing a new component in item library view with vcs

Browse Source 
- not completely sure why this fixed the issue

Change-Id: I3e514c64246831899511774cada4497ce86f5b7d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-05-02 15:46:23 +02:00
committed by Thomas Hartmann
parent e7e5c1bbae
commit 16063554da
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -198,6 +198,19 @@ public:
} }
} }
QString replacement = componentName + QLatin1String(" {\n");
if (!m_idName.isEmpty())
replacement += QLatin1String("id: ") + m_idName + QLatin1Char('\n');
foreach (const QString &property, result)
replacement += property + QLatin1String(": ") + propertyReader.readAstValue(property) + QLatin1Char('\n');
Utils::ChangeSet changes;
changes.replace(start, end, replacement);
currentFile->setChangeSet(changes);
currentFile->appendIndentRange(Range(start, end + 1));
currentFile->apply();
Core::IVersionControl *versionControl = Core::VcsManager::findVersionControlForDirectory(path); Core::IVersionControl *versionControl = Core::VcsManager::findVersionControlForDirectory(path);
if (versionControl if (versionControl
&& versionControl->supportsOperation(Core::IVersionControl::AddOperation)) { && versionControl->supportsOperation(Core::IVersionControl::AddOperation)) {
@@ -212,19 +225,6 @@ public:
Core::VcsManager::msgToAddToVcsFailed(QStringList(newFileName), versionControl)); Core::VcsManager::msgToAddToVcsFailed(QStringList(newFileName), versionControl));
} }
} }
QString replacement = componentName + QLatin1String(" {\n");
if (!m_idName.isEmpty())
replacement += QLatin1String("id: ") + m_idName + QLatin1Char('\n');
foreach (const QString &property, result)
replacement += property + QLatin1String(": ") + propertyReader.readAstValue(property) + QLatin1Char('\n');
Utils::ChangeSet changes;
changes.replace(start, end, replacement);
currentFile->setChangeSet(changes);
currentFile->appendIndentRange(Range(start, end + 1));
currentFile->apply();
} }
}; };