From 7656cbaa48f682c308b1aa88e2193f4a47021179 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 19 Aug 2016 07:03:00 +0200 Subject: [PATCH] Lowered minimal Qt. --- rssguard.pro | 6 +++++- src/gui/settings/settingsgui.cpp | 2 ++ src/gui/webbrowser.cpp | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rssguard.pro b/rssguard.pro index 1cba14907..a0e50fef7 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -55,8 +55,12 @@ DEFINES *= QT_USE_QSTRINGBUILDER message(rssguard: Welcome RSS Guard qmake script.) +lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 6) { + warning(rssguard: At least Qt "5.6.0" is required. Expect errors!!!) +} + lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) { - warning(rssguard: At least Qt 5.7.0 is required. Expect errors!!!) + warning(rssguard: You have Qt \"$$QT_VERSION\". Some features will be disabled.) } APP_NAME = "RSS Guard" diff --git a/src/gui/settings/settingsgui.cpp b/src/gui/settings/settingsgui.cpp index e38c43d56..d8bf9a170 100755 --- a/src/gui/settings/settingsgui.cpp +++ b/src/gui/settings/settingsgui.cpp @@ -53,6 +53,7 @@ SettingsGui::SettingsGui(Settings *settings, QWidget *parent) : SettingsPanel(se m_ui->m_treeSkins->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents); m_ui->m_treeSkins->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents); + connect(m_ui->m_cmbIconTheme, static_cast(&QComboBox::currentIndexChanged), this, &SettingsGui::requireRestart); connect(m_ui->m_cmbIconTheme, static_cast(&QComboBox::currentIndexChanged), this, &SettingsGui::dirtifySettings); connect(m_ui->m_treeSkins, &QTreeWidget::currentItemChanged, this, &SettingsGui::dirtifySettings); connect(m_ui->m_grpTray, &QGroupBox::toggled, this, &SettingsGui::dirtifySettings); @@ -70,6 +71,7 @@ SettingsGui::SettingsGui(Settings *settings, QWidget *parent) : SettingsPanel(se connect(m_ui->m_editorStatusbar, &ToolBarEditor::setupChanged, this, &SettingsGui::dirtifySettings); connect(m_ui->m_treeSkins, &QTreeWidget::currentItemChanged, this, &SettingsGui::onSkinSelected); + connect(m_ui->m_treeSkins, &QTreeWidget::currentItemChanged, this, &SettingsGui::requireRestart); connect(m_ui->m_cmbSelectToolBar, static_cast(&QComboBox::currentIndexChanged), m_ui->m_stackedToolbars, &QStackedWidget::setCurrentIndex); } diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index c22924d4c..e7f740c1d 100755 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -47,7 +47,10 @@ void WebBrowser::createConnections() { // Forward title/icon changes. connect(m_webView, SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString))); + +#if QT_VERSION >= 0x050700 connect(m_webView, SIGNAL(iconChanged(QIcon)), this, SLOT(onIconChanged(QIcon))); +#endif } void WebBrowser::updateUrl(const QUrl &url) {