summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-09-20 10:14:05 +0200
committerAndrea Diamantini <adjam7@gmail.com>2011-09-20 10:14:05 +0200
commitb7f444c22b7132ccb8090ecc5a63fa364730b068 (patch)
treebaae18dac7faed4770e7a8331ebee2fc8ed6ddea
parentQCoreApplication::postEvent fixes (diff)
downloadrekonq-b7f444c22b7132ccb8090ecc5a63fa364730b068.tar.xz
QtWebKit 2.2 related fixes
We now have to consider progress finished when it reaches 100, NOT when it is reset to 0, as before...
-rw-r--r--src/webtab.cpp9
-rw-r--r--src/webtab.h1
2 files changed, 1 insertions, 9 deletions
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 1eba22a1..9b1a31f9 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -85,7 +85,6 @@ WebTab::WebTab(QWidget *parent)
}
connect(m_webView, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
- connect(m_webView, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
connect(m_webView, SIGNAL(titleChanged(const QString &)), this, SIGNAL(titleChanged(const QString &)));
// Session Manager
@@ -120,15 +119,9 @@ void WebTab::updateProgress(int p)
}
-void WebTab::loadFinished(bool)
-{
- m_progress = 0;
-}
-
-
bool WebTab::isPageLoading()
{
- return m_progress != 0;
+ return m_progress != 0 && m_progress != 100;
}
diff --git a/src/webtab.h b/src/webtab.h
index 5157fb19..5700ba7a 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -93,7 +93,6 @@ public:
private Q_SLOTS:
void updateProgress(int progress);
- void loadFinished(bool);
void createWalletBar(const QString &, const QUrl &);
void showRSSInfo(const QPoint &pos);