Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Fixed compilation from previous commit

Browse Source
This commit is contained in:
nowrep 2012-07-06 20:28:10 +02:00
parent 19f34ecd4c
commit f9b38c4376
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/downloads/downloadmanager.cpp
View File

@ -108,7 +108,7 @@ void DownloadManager::startExternalManager(const QUrl &url)
bool success = QProcess::startDetached(m_externalExecutable, arguments); bool success = QProcess::startDetached(m_externalExecutable, arguments);
if (!success) { if (!success) {
QString info = "<ul><li><b>" + tr("Executable: ") + "</b>" + m_externalExecutable + "</li><li><b>" + tr("Arguments: ") + "</b>" + arguments.join(' ') + "</li></ul>"; QString info = "<ul><li><b>" + tr("Executable: ") + "</b>" + m_externalExecutable + "</li><li><b>" + tr("Arguments: ") + "</b>" + arguments.join(" ") + "</li></ul>";
QMessageBox::critical(this, tr("Cannot start external download manager"), tr("Cannot start external download manager! %1").arg(info)); QMessageBox::critical(this, tr("Cannot start external download manager"), tr("Cannot start external download manager! %1").arg(info));
} }
} }

2
src/lib/network/qupzillaschemehandler.cpp
View File

@ -414,7 +414,7 @@ QString QupZillaSchemeReply::configPage()
} }
case QVariant::StringList: case QVariant::StringList:
keyString = keyValue.toStringList().join(','); keyString = keyValue.toStringList().join(",");
break; break;
default: default:

2
src/lib/preferences/preferences.cpp
View File

@ -398,7 +398,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
ui->httpsProxyUsername->setText(settings.value("HttpsUsername", "").toString()); ui->httpsProxyUsername->setText(settings.value("HttpsUsername", "").toString());
ui->httpsProxyPassword->setText(settings.value("HttpsPassword", "").toString()); ui->httpsProxyPassword->setText(settings.value("HttpsPassword", "").toString());
ui->proxyExceptions->setText(settings.value("ProxyExceptions", QStringList() << "localhost" << "127.0.0.1").toStringList().join(',')); ui->proxyExceptions->setText(settings.value("ProxyExceptions", QStringList() << "localhost" << "127.0.0.1").toStringList().join(","));
settings.endGroup(); settings.endGroup();
useDifferentProxyForHttpsChanged(ui->useHttpsProxy->isChecked()); useDifferentProxyForHttpsChanged(ui->useHttpsProxy->isChecked());

2
src/lib/rss/rssnotification.cpp
View File

@ -33,7 +33,7 @@
bool startExternalProcess(const QString &program, const QStringList &arguments) bool startExternalProcess(const QString &program, const QStringList &arguments)
{ {
if (!QProcess::startDetached(program, arguments)) { if (!QProcess::startDetached(program, arguments)) {
QString info = "<ul><li><b>" + RSSNotification::tr("Executable: ") + "</b>" + program + "</li><li><b>" + RSSNotification::tr("Arguments: ") + "</b>" + arguments.join(' ') + "</li></ul>"; QString info = "<ul><li><b>" + RSSNotification::tr("Executable: ") + "</b>" + program + "</li><li><b>" + RSSNotification::tr("Arguments: ") + "</b>" + arguments.join(" ") + "</li></ul>";
QMessageBox::critical(0, RSSNotification::tr("Cannot start external program"), RSSNotification::tr("Cannot start external program! %1").arg(info)); QMessageBox::critical(0, RSSNotification::tr("Cannot start external program"), RSSNotification::tr("Cannot start external program! %1").arg(info));
return false; return false;