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

Fix build with newest Qt 6

Browse Source 
No implicit casts from QString to QFileInfo anymore, and a few more
QChar(int) fixes.

Task-number: QTCREATORBUG-24098
Change-Id: I3326fc0701a9259c7bdd2d8c3025de0a4774f8aa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-11-20 16:08:08 +01:00
parent 01331893ad
commit f534624fce
15 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -58,7 +58,7 @@ QVariant FilePathItem::data(int column, int role) const
case Qt::DisplayRole:
return m_filePath;
case Qt::DecorationRole:
return Core::FileIconProvider::icon(m_filePath);
return Core::FileIconProvider::icon(QFileInfo(m_filePath));
case Debugger::DetailedErrorView::FullTextRole:
return m_filePath;
default:

2
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -422,7 +422,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths)
auto item = new QTreeWidgetItem(ui.treeWidget);
item->setText(FileName, visibleName);
item->setIcon(FileName, FileIconProvider::icon(info));
item->setText(Folder, Utils::FilePath::fromFileInfo(directory).shortNativePath());
item->setText(Folder, Utils::FilePath::fromString(directory).shortNativePath());
auto radioButtonGroup = new QButtonGroup;
// Add a button for opening the file with a version control system

2
src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
View File

@@ -79,7 +79,7 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent,
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.treeWidget, QStringList()
<< visibleName << QDir::toNativeSeparators(directory));
if (!fileName.isEmpty())
item->setIcon(0, FileIconProvider::icon(fileName));
item->setIcon(0, FileIconProvider::icon(QFileInfo(fileName)));
item->setData(0, Qt::UserRole, QVariant::fromValue(document));
}

2
src/plugins/coreplugin/locator/locatorwidget.cpp
View File

@@ -204,7 +204,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
if (index.column() == DisplayNameColumn) {
LocatorFilterEntry &entry = mEntries[index.row()];
if (!entry.displayIcon && !entry.fileName.isEmpty())
entry.displayIcon = FileIconProvider::icon(entry.fileName);
entry.displayIcon = FileIconProvider::icon(QFileInfo(entry.fileName));
return entry.displayIcon ? entry.displayIcon.value() : QIcon();
}
break;

2
src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp
View File

@@ -47,7 +47,7 @@ QVariant FilePathItem::data(int column, int role) const
case Qt::DisplayRole:
return m_filePath;
case Qt::DecorationRole:
return Core::FileIconProvider::icon(m_filePath);
return Core::FileIconProvider::icon(QFileInfo(m_filePath));
case Debugger::DetailedErrorView::FullTextRole:
return m_filePath;
default:

2
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -442,7 +442,7 @@ void GenericBuildSystem::parse(RefreshOptions options)
FilePath GenericBuildSystem::findCommonSourceRoot()
{
if (m_files.isEmpty())
return FilePath::fromFileInfo(QFileInfo(m_filesFileName).absolutePath());
return FilePath::fromFileInfo(QFileInfo(m_filesFileName));
QString root = m_files.front();
for (const QString &item : qAsConst(m_files)) {

2
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -75,7 +75,7 @@ static QString packagePathFromSettings(const QString &settingsKey,
const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/' +
QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + settingsKey;
const QString path = settings->value(key, defaultPath).toString();
return FilePath::fromFileInfo(path).toString();
return FilePath::fromUserInput(path).toString();
}
static bool automaticKitCreationFromSettings(QSettings::Scope scope = QSettings::UserScope)

2
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -661,7 +661,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
commitEditor->document()->setPreferredDisplayName(msg);
const QString branch = vcsTopic(m_submitRepository);
commitEditor->setFields(m_submitRepository, branch,
commitEditor->setFields(QFileInfo(m_submitRepository), branch,
m_settings.stringValue(MercurialSettings::userNameKey),
m_settings.stringValue(MercurialSettings::userEmailKey), status);
}

2
src/plugins/projectexplorer/dependenciespanel.cpp
View File

@@ -99,7 +99,7 @@ QVariant DependenciesModel::data(const QModelIndex &index, int role) const
case Qt::CheckStateRole:
return SessionManager::hasDependency(m_project, p) ? Qt::Checked : Qt::Unchecked;
case Qt::DecorationRole:
return Core::FileIconProvider::icon(p->projectFilePath().toString());
return Core::FileIconProvider::icon(p->projectFilePath().toFileInfo());
default:
return QVariant();
}

2
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -145,7 +145,7 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const
}
case Qt::DecorationRole: {
if (!folderNode)
return Core::FileIconProvider::icon(node->filePath().toString());
return Core::FileIconProvider::icon(node->filePath().toFileInfo());
if (!project)
return folderNode->icon();
static QIcon warnIcon = Utils::Icons::WARNING.icon();

7
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
View File

@@ -277,11 +277,12 @@ void SubComponentManager::parseFile(const QString &canonicalFilePath, bool addTo
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
return;
QString dir = QFileInfo(canonicalFilePath).path();
const QFileInfo fi(canonicalFilePath);
const QString dir = fi.path();
foreach (const QString &qualifier, m_dirToQualifier.values(dir)) {
registerQmlFile(canonicalFilePath, qualifier, addToLibrary);
registerQmlFile(fi, qualifier, addToLibrary);
}
registerQmlFile(canonicalFilePath, qualification, addToLibrary);
registerQmlFile(fi, qualification, addToLibrary);
}
void SubComponentManager::parseFile(const QString &canonicalFilePath)

2
src/plugins/resourceeditor/qrceditor/resourcefile.cpp
View File

@@ -793,7 +793,7 @@ QVariant ResourceModel::data(const QModelIndex &index, int role) const
if (iconFileExtension(path))
file->icon = QIcon(path);
else
file->icon = Core::FileIconProvider::icon(path);
file->icon = Core::FileIconProvider::icon(QFileInfo(path));
}
if (!file->icon.isNull())
result = file->icon;

2
src/plugins/resourceeditor/resourcenode.cpp
View File

@@ -244,7 +244,7 @@ ResourceTopLevelNode::ResourceTopLevelNode(const FilePath &filePath,
const QString &contents)
: FolderNode(filePath)
{
setIcon(FileIconProvider::icon(filePath.toString()));
setIcon(FileIconProvider::icon(filePath.toFileInfo()));
setPriority(Node::DefaultFilePriority);
setListInProject(true);
setAddFileFilter("*.png; *.jpg; *.gif; *.svg; *.ico; *.qml; *.qml.ui");

2
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -130,7 +130,7 @@ void UpdateInfoPlugin::startCheckForUpdates()
d->m_checkUpdatesCommand->setDisplayName(tr("Checking for Updates"));
connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput);
connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished);
d->m_checkUpdatesCommand->addJob({Utils::FilePath::fromFileInfo(d->m_maintenanceTool), {"--checkupdates"}},
d->m_checkUpdatesCommand->addJob({Utils::FilePath::fromString(d->m_maintenanceTool), {"--checkupdates"}},
60 * 3, // 3 minutes timeout
/*workingDirectory=*/QString(),
[](int /*exitCode*/) { return Utils::SynchronousProcessResponse::Finished; });

4
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -3800,7 +3800,7 @@ void tst_Dumpers::dumper_data()
expected1.append(QChar(1));
expected1.append("BBB\"");
QChar oUmlaut = 0xf6;
QChar oUmlaut = QChar(0xf6);
QTest::newRow("QString")
<< Data("#include <QByteArray>\n"
@@ -5957,7 +5957,7 @@ void tst_Dumpers::dumper_data()
+ Check("a1.0.2", "[2]", FloatValue("20"), "double")
+ Check("a1.2", "[2]", Pointer(), "double[4]")
+ Check("a2", Value("\"abcd" + QString(16, 0) + '"'), "char [20]")
+ Check("a2", Value("\"abcd" + QString(16, QChar(0)) + '"'), "char [20]")
+ Check("a2.0", "[0]", "97", "char")
+ Check("a2.3", "[3]", "100", "char");