diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro index ecb196ad376bed6be4ecbdf4e9b8f28e973e4824..9ae137fb29d784a642d37f6fa1599b083b41b9cd 100644 --- a/src/plugins/resourceeditor/resourceeditor.pro +++ b/src/plugins/resourceeditor/resourceeditor.pro @@ -1,6 +1,8 @@ TEMPLATE = lib TARGET = ResourceEditor +DEFINES += QT_NO_CAST_FROM_ASCII + include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp index 46028635b9cdedcecb982a77e9dc9c8dbec2fb18..f8af0c85b56f912c530553fb6e82822df2a82e63 100644 --- a/src/shared/qrceditor/qrceditor.cpp +++ b/src/shared/qrceditor/qrceditor.cpp @@ -304,7 +304,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files) if (clickedButton == context.copyButton) { const QFileInfo fi(file); QFileInfo suggestion; - QDir tmpTarget(dir.path() + QString(QDir::separator()) + QString("Resources"));; + QDir tmpTarget(dir.path() + QDir::separator() + QLatin1String("Resources")); if (tmpTarget.exists()) suggestion.setFile(tmpTarget, fi.fileName()); else