FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt 5 compilation fixes.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-09 17:12:05 +01:00
parent 1bace42ad7
commit 4b49af2e23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/networkfactory.cpp
View File

@ -14,7 +14,11 @@ NetworkFactory::NetworkFactory() {
QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QString &url, QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QString &url,
int timeout, int timeout,
QIcon &output) { QIcon &output) {
#if QT_VERSION >= 0x050000
QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(url.toHtmlEscaped());
#else
QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(Qt::escape(url)); QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(Qt::escape(url));
#endif
QByteArray icon_data; QByteArray icon_data;
QNetworkReply::NetworkError network_result = downloadFeedFile(google_s2_with_url, QNetworkReply::NetworkError network_result = downloadFeedFile(google_s2_with_url,

8
src/gui/formsettings.cpp
View File

@ -468,9 +468,13 @@ void FormSettings::loadDataStorage() {
m_ui->m_spinMysqlPort->setValue(Settings::instance()->value(APP_CFG_DB, "mysql_port", APP_DB_MYSQL_PORT).toInt()); m_ui->m_spinMysqlPort->setValue(Settings::instance()->value(APP_CFG_DB, "mysql_port", APP_DB_MYSQL_PORT).toInt());
} }
m_ui->m_cmbDatabaseDriver->setCurrentIndex(m_ui->m_cmbDatabaseDriver->findData(Settings::instance()->value(APP_CFG_DB, int index_current_backend = m_ui->m_cmbDatabaseDriver->findData(Settings::instance()->value(APP_CFG_DB,
"database_driver", "database_driver",
APP_DB_DRIVER_SQLITE).toString())); APP_DB_DRIVER_SQLITE).toString());
if (index_current_backend >= 0) {
m_ui->m_cmbDatabaseDriver->setCurrentIndex(index_current_backend);
}
} }
void FormSettings::saveDataStorage() { void FormSettings::saveDataStorage() {