forked from qt-creator/qt-creator
Id: Add QByteArray constructor
Distinguish from const char * one. QString ctor is yet to be removed Change-Id: I2da231036c6417353b0566d39666d918ad141c6d Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
f31da9ac55
commit
7c4e2b6c60
@@ -74,7 +74,7 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
|
||||
|
||||
Core::Id CMakeEditor::id() const
|
||||
{
|
||||
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
|
||||
return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
|
||||
}
|
||||
|
||||
void CMakeEditor::markAsChanged()
|
||||
|
||||
@@ -69,7 +69,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeManager *manager)
|
||||
|
||||
Core::Id CMakeEditorFactory::id() const
|
||||
{
|
||||
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
|
||||
return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
|
||||
}
|
||||
|
||||
QString CMakeEditorFactory::displayName() const
|
||||
|
||||
@@ -565,5 +565,5 @@ QString CMakeRunConfigurationFactory::buildTargetFromId(Core::Id id)
|
||||
Core::Id CMakeRunConfigurationFactory::idFromBuildTarget(const QString &target)
|
||||
{
|
||||
QString id = QString::fromLatin1(CMAKE_RC_PREFIX) + target;
|
||||
return Core::Id(id.toUtf8().constData());
|
||||
return Core::Id(id.toUtf8());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user