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:
@@ -126,7 +126,7 @@ bool BinaryVersionToolTipEventFilter::eventFilter(QObject *o, QEvent *e)
|
||||
const QString binary = le->text();
|
||||
if (!binary.isEmpty()) {
|
||||
const QString version = BinaryVersionToolTipEventFilter::toolVersion(
|
||||
CommandLine(QDir::cleanPath(binary), m_arguments));
|
||||
CommandLine(FilePath::fromString(QDir::cleanPath(binary)), m_arguments));
|
||||
if (!version.isEmpty()) {
|
||||
// Concatenate tooltips.
|
||||
QString tooltip = "<html><head/><body>";
|
||||
@@ -720,7 +720,7 @@ FancyLineEdit *PathChooser::lineEdit() const
|
||||
|
||||
QString PathChooser::toolVersion(const QString &binary, const QStringList &arguments)
|
||||
{
|
||||
return BinaryVersionToolTipEventFilter::toolVersion({binary, arguments});
|
||||
return BinaryVersionToolTipEventFilter::toolVersion({FilePath::fromString(binary), arguments});
|
||||
}
|
||||
|
||||
void PathChooser::installLineEditVersionToolTip(QLineEdit *le, const QStringList &arguments)
|
||||
|
||||
Reference in New Issue
Block a user