diff --git a/debuggers/common/midebugger.h b/debuggers/common/midebugger.h
--- a/debuggers/common/midebugger.h
+++ b/debuggers/common/midebugger.h
@@ -135,7 +135,7 @@
void processLine(const QByteArray& line);
protected:
- QString debuggerBinary_;
+ QString debuggerExecutable_;
KProcess* process_;
MI::MICommand* currentCmd_;
diff --git a/debuggers/common/midebugger.cpp b/debuggers/common/midebugger.cpp
--- a/debuggers/common/midebugger.cpp
+++ b/debuggers/common/midebugger.cpp
@@ -328,7 +328,7 @@
i18n("Could not start debugger."
"Could not run '%1'. "
"Make sure that the path name is specified correctly.",
- debuggerBinary_),
+ debuggerExecutable_),
i18n("Could not start debugger"));
emit userCommandOutput("Process failed to start\n");
@@ -341,7 +341,7 @@
"
The debugger process '%1' crashed.
"
"Because of that the debug session has to be ended.
"
"Try to reproduce the crash without KDevelop and report a bug.
",
- debuggerBinary_),
+ debuggerExecutable_),
i18n("Debugger crashed"));
emit userCommandOutput("Process crashed\n");
diff --git a/debuggers/common/midebugjobs.cpp b/debuggers/common/midebugjobs.cpp
--- a/debuggers/common/midebugjobs.cpp
+++ b/debuggers/common/midebugjobs.cpp
@@ -172,7 +172,7 @@
return;
}
- if (!m_session->examineCoreFile(dlg.binary(), dlg.core())) {
+ if (!m_session->examineCoreFile(dlg.executableFile(), dlg.core())) {
done();
}
}
diff --git a/debuggers/gdb/gdb.cpp b/debuggers/gdb/gdb.cpp
--- a/debuggers/gdb/gdb.cpp
+++ b/debuggers/gdb/gdb.cpp
@@ -53,10 +53,10 @@
// FIXME: verify that default value leads to something sensible
QUrl gdbUrl = config.readEntry(Config::GdbPathEntry, QUrl());
if (gdbUrl.isEmpty()) {
- debuggerBinary_ = "gdb";
+ debuggerExecutable_ = QStringLiteral("gdb");
} else {
// FIXME: verify its' a local path.
- debuggerBinary_ = gdbUrl.url(QUrl::PreferLocalFile | QUrl::StripTrailingSlash);
+ debuggerExecutable_ = gdbUrl.url(QUrl::PreferLocalFile | QUrl::StripTrailingSlash);
}
QStringList arguments = extraArguments;
@@ -81,19 +81,19 @@
return false;
}
- arguments.insert(0, debuggerBinary_);
+ arguments.insert(0, debuggerExecutable_);
arguments.insert(0, shell.toLocalFile());
process_->setShellCommand(KShell::joinArgs(arguments));
} else {
- process_->setProgram(debuggerBinary_, arguments);
+ process_->setProgram(debuggerExecutable_, arguments);
}
process_->start();
- qCDebug(DEBUGGERGDB) << "Starting GDB with command" << shell.toLocalFile() + ' ' + debuggerBinary_
- + ' ' + arguments.join(' ');
+ qCDebug(DEBUGGERGDB) << "Starting GDB with command" << shell.toLocalFile() + QLatin1Char(' ') + debuggerExecutable_
+ + QLatin1Char(' ') + arguments.join(QLatin1Char(' '));
qCDebug(DEBUGGERGDB) << "GDB process pid:" << process_->pid();
- emit userCommandOutput(shell.toLocalFile() + ' ' + debuggerBinary_
- + ' ' + arguments.join(' ') + '\n');
+ emit userCommandOutput(shell.toLocalFile() + QLatin1Char(' ') + debuggerExecutable_
+ + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')) + QLatin1Char('\n'));
return true;
}
diff --git a/debuggers/gdb/gdbconfigpage.ui b/debuggers/gdb/gdbconfigpage.ui
--- a/debuggers/gdb/gdbconfigpage.ui
+++ b/debuggers/gdb/gdbconfigpage.ui
@@ -45,7 +45,7 @@
Gdb executable
- To run "gdb" binary from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable.
+ To run "gdb" executable from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable.
Override path to gdb executable
diff --git a/debuggers/lldb/lldbdebugger.cpp b/debuggers/lldb/lldbdebugger.cpp
--- a/debuggers/lldb/lldbdebugger.cpp
+++ b/debuggers/lldb/lldbdebugger.cpp
@@ -51,9 +51,9 @@
// Get path to executable
QUrl lldbUrl = config.readEntry(Config::LldbExecutableEntry, QUrl());
if (!lldbUrl.isValid() || !lldbUrl.isLocalFile()) {
- debuggerBinary_ = "lldb-mi";
+ debuggerExecutable_ = QStringLiteral("lldb-mi");
} else {
- debuggerBinary_ = lldbUrl.toLocalFile();
+ debuggerExecutable_ = lldbUrl.toLocalFile();
}
// Get arguments
@@ -74,12 +74,12 @@
// Start!
process_->setProcessEnvironment(processEnv);
- process_->setProgram(debuggerBinary_, arguments);
+ process_->setProgram(debuggerExecutable_, arguments);
process_->start();
- qCDebug(DEBUGGERLLDB) << "Starting LLDB with command" << debuggerBinary_ + ' ' + arguments.join(' ');
+ qCDebug(DEBUGGERLLDB) << "Starting LLDB with command" << debuggerExecutable_ + QLatin1Char(' ') + arguments.join(QLatin1Char(' '));
qCDebug(DEBUGGERLLDB) << "LLDB process pid:" << process_->pid();
- emit userCommandOutput(debuggerBinary_ + ' ' + arguments.join(' ') + '\n');
+ emit userCommandOutput(debuggerExecutable_ + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')) + QLatin1Char('\n'));
return true;
}
diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
--- a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
@@ -67,7 +67,7 @@
-
- Compiler path:
+ Compiler executable:
diff --git a/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg b/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg
--- a/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg
+++ b/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg
@@ -6,7 +6,7 @@
cmakeutils.h
-
+
CMake::findExecutable()
The path to the default CMake executable.
diff --git a/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp b/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp
--- a/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp
+++ b/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp
@@ -35,11 +35,11 @@
m_prefsUi->setupUi(this);
#ifdef Q_OS_WIN
- m_prefsUi->kcfg_cmakeExe->setFilter("*.exe");
+ m_prefsUi->kcfg_cmakeExecutable->setFilter(QStringLiteral("*.exe"));
#endif
- m_prefsUi->kcfg_cmakeExe->setToolTip(CMakeBuilderSettings::self()->cmakeExeItem()->whatsThis());
- m_prefsUi->label1->setToolTip(CMakeBuilderSettings::self()->cmakeExeItem()->whatsThis());
+ m_prefsUi->kcfg_cmakeExecutable->setToolTip(CMakeBuilderSettings::self()->cmakeExecutableItem()->whatsThis());
+ m_prefsUi->label1->setToolTip(CMakeBuilderSettings::self()->cmakeExecutableItem()->whatsThis());
foreach(const QString& generator, CMakeBuilder::supportedGenerators())
m_prefsUi->kcfg_generator->addItem(generator);
diff --git a/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui b/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui
--- a/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui
+++ b/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui
@@ -22,7 +22,7 @@