mirror of
https://github.com/martinrotter/rssguard.git
synced 2025-02-01 18:06:51 +01:00
Remove some #ifdefs.
This commit is contained in:
parent
58c6d8840e
commit
82c2970e1d
@ -47,9 +47,7 @@ void WebBrowser::createConnections() {
|
|||||||
|
|
||||||
// Forward title/icon changes.
|
// Forward title/icon changes.
|
||||||
connect(m_webView, &WebViewer::titleChanged, this, &WebBrowser::onTitleChanged);
|
connect(m_webView, &WebViewer::titleChanged, this, &WebBrowser::onTitleChanged);
|
||||||
#if QT_VERSION >= 0x050700
|
|
||||||
connect(m_webView, &WebViewer::iconChanged, this, &WebBrowser::onIconChanged);
|
connect(m_webView, &WebViewer::iconChanged, this, &WebBrowser::onIconChanged);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebBrowser::updateUrl(const QUrl& url) {
|
void WebBrowser::updateUrl(const QUrl& url) {
|
||||||
@ -168,13 +166,10 @@ void WebBrowser::onTitleChanged(const QString& new_title) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050700
|
|
||||||
void WebBrowser::onIconChanged(const QIcon& icon) {
|
void WebBrowser::onIconChanged(const QIcon& icon) {
|
||||||
emit iconChanged(m_index, icon);
|
emit iconChanged(m_index, icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void WebBrowser::initializeLayout() {
|
void WebBrowser::initializeLayout() {
|
||||||
m_toolBar->setFloatable(false);
|
m_toolBar->setFloatable(false);
|
||||||
m_toolBar->setMovable(false);
|
m_toolBar->setMovable(false);
|
||||||
|
@ -82,10 +82,7 @@ class WebBrowser : public TabContent {
|
|||||||
void receiveMessageStatusChangeRequest(int message_id, WebPage::MessageStatusChange change);
|
void receiveMessageStatusChangeRequest(int message_id, WebPage::MessageStatusChange change);
|
||||||
|
|
||||||
void onTitleChanged(const QString& new_title);
|
void onTitleChanged(const QString& new_title);
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050700
|
|
||||||
void onIconChanged(const QIcon& icon);
|
void onIconChanged(const QIcon& icon);
|
||||||
#endif
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user