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

Fix build after merge

Browse Source 
Change-Id: I424cb312d7ede82890d46cd9b09260babb11f62f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2021-05-07 10:26:56 +02:00
parent bf5b1d714c
commit 448446bd7e
2 changed files with 190 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -213,8 +213,7 @@ QmlDesignerPlugin::~QmlDesignerPlugin()
bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/)
{
Sqlite::LibraryInitializer::initialize();
QDir{}.mkpath(Core::ICore::cacheResourcePath());
QDir{}.mkpath(Core::ICore::cacheResourcePath().toString());
if (!Utils::HostOsInfo::canCreateOpenGLContext(errorMessage))
return false;
@@ -222,8 +221,10 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
if (DesignerSettings::getValue(DesignerSettingsKey::STANDALONE_MODE).toBool())
GenerateResource::generateMenuEntry();
QString fontPath = Core::ICore::resourcePath() +
QStringLiteral("/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf");
const QString fontPath
= Core::ICore::resourcePath(
"qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf")
.toString();
if (QFontDatabase::addApplicationFont(fontPath) < 0)
qCWarning(qmldesignerLog) << "Could not add font " << fontPath << "to font database";