forked from qt-creator/qt-creator
Utils: Introduce a FilePath constructor from char arrays
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -83,6 +83,8 @@ using namespace ScxmlEditor::PluginInterface;
|
||||
using namespace ScxmlEditor::Common;
|
||||
using namespace ScxmlEditor::OutputPane;
|
||||
|
||||
using namespace Utils;
|
||||
|
||||
void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
|
||||
{
|
||||
QString strOutput;
|
||||
@@ -159,7 +161,7 @@ static QIcon toolButtonIcon(ActionType actionType)
|
||||
return QIcon();
|
||||
}
|
||||
|
||||
return Utils::Icon({{iconFileName, Utils::Theme::IconsBaseColor}}).icon();
|
||||
return Icon({{FilePath::fromString(iconFileName), Theme::IconsBaseColor}}).icon();
|
||||
}
|
||||
|
||||
MainWidget::MainWidget(QWidget *parent)
|
||||
|
||||
Reference in New Issue
Block a user