aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/main.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2021-04-29 15:38:01 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2021-06-07 12:16:27 +0000
commit422409bf261c3653f98b4fc3163829eee393d6ef (patch)
tree367d29cd0093d9e6e36e4b4773e6b8f9cbea290c /src/app/main.cpp
parent9db6569c43bd2acfb453b5e67f13d7f0ee4448a6 (diff)
Add TestStringTable test
The TestStringTable tests the fix provided for a crash in StringTable on shutdown. Amends: f4ab1279fd55a00e2bede18ec9ad283c668b46bd Task-number: QTCREATORBUG-25417 Change-Id: I5a4a7e4a20e1b9611682a976d38dee17d4603c5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/app/main.cpp')
-rw-r--r--src/app/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 248fa8efef5..57b4281c51f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -435,7 +435,9 @@ public:
void setArguments(const QStringList &args) { m_args = args; }
+ QString executable() const { return m_executable; }
QStringList arguments() const { return m_args; }
+ QString workingPath() const { return m_workingPath; }
int restartOrExit(int exitCode)
{
@@ -696,6 +698,9 @@ int main(int argc, char **argv)
}
restarter.setArguments(options.preAppArguments + PluginManager::argumentsForRestart()
+ lastSessionArgument());
+ const PluginManager::ProcessData processData = { restarter.executable(),
+ options.preAppArguments + PluginManager::argumentsForRestart(), restarter.workingPath() };
+ PluginManager::setCreatorProcessData(processData);
const PluginSpecSet plugins = PluginManager::plugins();
PluginSpec *coreplugin = nullptr;