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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
This commit is contained in:
Eike Ziller
2020-04-28 15:48:36 +02:00
parent 6efed7140b 05f746cfd0
commit e9661e43cb
42 changed files with 573 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -179,12 +179,12 @@ void BaseStringAspect::toMap(QVariantMap &map) const
FilePath BaseStringAspect::filePath() const
{
return FilePath::fromString(d->m_value);
return FilePath::fromUserInput(d->m_value);
}
void BaseStringAspect::setFilePath(const FilePath &val)
{
setValue(val.toString());
setValue(val.toUserOutput());
}
void BaseStringAspect::setLabelText(const QString &labelText)