forked from qt-creator/qt-creator
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -203,7 +203,7 @@ static void printParseWarnings(const FilePath &libraryPath, const QString &warni
|
||||
"%2").arg(libraryPath.toUserOutput(), warning));
|
||||
}
|
||||
|
||||
static QString qmlPluginDumpErrorMessage(QtcProcess *process)
|
||||
static QString qmlPluginDumpErrorMessage(Process *process)
|
||||
{
|
||||
QString errorMessage;
|
||||
const QString binary = process->commandLine().executable().toUserOutput();
|
||||
@@ -237,7 +237,7 @@ static QString qmlPluginDumpErrorMessage(QtcProcess *process)
|
||||
return errorMessage;
|
||||
}
|
||||
|
||||
void PluginDumper::qmlPluginTypeDumpDone(QtcProcess *process)
|
||||
void PluginDumper::qmlPluginTypeDumpDone(Process *process)
|
||||
{
|
||||
process->deleteLater();
|
||||
|
||||
@@ -597,11 +597,11 @@ void PluginDumper::loadQmltypesFile(const FilePaths &qmltypesFilePaths,
|
||||
void PluginDumper::runQmlDump(const ModelManagerInterface::ProjectInfo &info,
|
||||
const QStringList &arguments, const FilePath &importPath)
|
||||
{
|
||||
auto process = new QtcProcess(this);
|
||||
auto process = new Process(this);
|
||||
process->setEnvironment(info.qmlDumpEnvironment);
|
||||
process->setWorkingDirectory(importPath);
|
||||
process->setCommand({info.qmlDumpPath, arguments});
|
||||
connect(process, &QtcProcess::done, this, [this, process] { qmlPluginTypeDumpDone(process); });
|
||||
connect(process, &Process::done, this, [this, process] { qmlPluginTypeDumpDone(process); });
|
||||
process->start();
|
||||
m_runningQmldumps.insert(process, importPath);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ QT_END_NAMESPACE
|
||||
|
||||
namespace Utils {
|
||||
class FileSystemWatcher;
|
||||
class QtcProcess;
|
||||
class Process;
|
||||
}
|
||||
|
||||
namespace QmlJS {
|
||||
@@ -41,7 +41,7 @@ private:
|
||||
const QString &importUri,
|
||||
const QString &importVersion);
|
||||
Q_INVOKABLE void dumpAllPlugins();
|
||||
void qmlPluginTypeDumpDone(Utils::QtcProcess *process);
|
||||
void qmlPluginTypeDumpDone(Utils::Process *process);
|
||||
void pluginChanged(const QString &pluginLibrary);
|
||||
|
||||
private:
|
||||
@@ -102,7 +102,7 @@ private:
|
||||
|
||||
ModelManagerInterface *m_modelManager;
|
||||
Utils::FileSystemWatcher *m_pluginWatcher;
|
||||
QHash<Utils::QtcProcess *, Utils::FilePath> m_runningQmldumps;
|
||||
QHash<Utils::Process *, Utils::FilePath> m_runningQmldumps;
|
||||
QList<Plugin> m_plugins;
|
||||
QHash<Utils::FilePath, int> m_libraryToPluginIndex;
|
||||
QHash<QString, QmlJS::ModelManagerInterface::ProjectInfo> m_qtToInfo;
|
||||
|
||||
Reference in New Issue
Block a user