diff options
Diffstat (limited to 'src/plugins/debugger/debuggerdialogs.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerdialogs.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 226026f99c..203dea6071 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -479,14 +479,14 @@ StartApplicationParameters StartApplicationDialog::parameters() const StartApplicationParameters result; result.serverPort = d->serverPortSpinBox->value(); result.serverAddress = d->channelOverrideEdit->text(); - result.runnable.executable = d->localExecutablePathChooser->fileName(); - result.serverStartScript = d->serverStartScriptPathChooser->fileName(); + result.runnable.executable = d->localExecutablePathChooser->filePath(); + result.serverStartScript = d->serverStartScriptPathChooser->filePath(); result.serverInitCommands = d->serverInitCommandsTextEdit->toPlainText(); result.serverResetCommands = d->serverResetCommandsTextEdit->toPlainText(); result.kitId = d->kitChooser->currentKitId(); - result.debugInfoLocation = d->debuginfoPathChooser->path(); + result.debugInfoLocation = d->debuginfoPathChooser->filePath().toString(); result.runnable.commandLineArguments = d->arguments->text(); - result.runnable.workingDirectory = d->workingDirectory->path(); + result.runnable.workingDirectory = d->workingDirectory->filePath().toString(); result.breakAtMain = d->breakAtMainCheckBox->isChecked(); result.runInTerminal = d->runInTerminalCheckBox->isChecked(); return result; @@ -497,8 +497,8 @@ void StartApplicationDialog::setParameters(const StartApplicationParameters &p) d->kitChooser->setCurrentKitId(p.kitId); d->serverPortSpinBox->setValue(p.serverPort); d->channelOverrideEdit->setText(p.serverAddress); - d->localExecutablePathChooser->setFileName(p.runnable.executable); - d->serverStartScriptPathChooser->setFileName(p.serverStartScript); + d->localExecutablePathChooser->setFilePath(p.runnable.executable); + d->serverStartScriptPathChooser->setFilePath(p.serverStartScript); d->serverInitCommandsTextEdit->setPlainText(p.serverInitCommands); d->serverResetCommandsTextEdit->setPlainText(p.serverResetCommands); d->debuginfoPathChooser->setPath(p.debugInfoLocation); @@ -580,7 +580,7 @@ void AttachToQmlPortDialog::setKitId(Id id) // --------- StartRemoteCdbDialog static QString cdbRemoteHelp() { - const char *cdbConnectionSyntax = + const char cdbConnectionSyntax[] = "Server:Port<br>" "tcp:server=Server,port=Port[,password=Password][,ipversion=6]\n" "tcp:clicon=Server,port=Port[,password=Password][,ipversion=6]\n" @@ -599,10 +599,10 @@ static QString cdbRemoteHelp() "Launch the remote CDB as <code>%5 <executable></code> " "to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>" "<pre>%6</pre></body></html>") - .arg(Core::Constants::IDE_DISPLAY_NAME, - ext32, ext64, "_NT_DEBUGGER_EXTENSION_PATH", - "cdb.exe -server tcp:port=1234", - QLatin1String(cdbConnectionSyntax)); + .arg(QString(Core::Constants::IDE_DISPLAY_NAME), + ext32, ext64, QString("_NT_DEBUGGER_EXTENSION_PATH"), + QString("cdb.exe -server tcp:port=1234"), + QString(cdbConnectionSyntax)); } StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : |