Title: [92276] trunk/Tools
- Revision
- 92276
- Author
- [email protected]
- Date
- 2011-08-03 06:15:39 -0700 (Wed, 03 Aug 2011)
Log Message
[Qt] MiniBrowser: Unbreak load progress indication.
https://bugs.webkit.org/show_bug.cgi?id=65614
Reviewed by Kenneth Rohde Christiansen.
loadProgress() was renamed to loadProgressChanged().
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::onLoadProgressChanged):
* MiniBrowser/qt/BrowserWindow.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92275 => 92276)
--- trunk/Tools/ChangeLog 2011-08-03 13:05:46 UTC (rev 92275)
+++ trunk/Tools/ChangeLog 2011-08-03 13:15:39 UTC (rev 92276)
@@ -1,3 +1,17 @@
+2011-08-03 Andreas Kling <[email protected]>
+
+ [Qt] MiniBrowser: Unbreak load progress indication.
+ https://bugs.webkit.org/show_bug.cgi?id=65614
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ loadProgress() was renamed to loadProgressChanged().
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::onLoadProgressChanged):
+ * MiniBrowser/qt/BrowserWindow.h:
+
2011-08-03 Martin Robinson <[email protected]>
Build fix for WebKit2GTK+.
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (92275 => 92276)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-08-03 13:05:46 UTC (rev 92275)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-08-03 13:15:39 UTC (rev 92276)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2010, 2011 Nokia Corporation and/or its subsidiary(-ies)
* Copyright (C) 2010 University of Szeged
*
* All rights reserved.
@@ -57,7 +57,7 @@
setAttribute(Qt::WA_DeleteOnClose);
- connect(webView(), SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
+ connect(webView(), SIGNAL(loadProgressChanged(int)), SLOT(onLoadProgressChanged(int)));
connect(webView(), SIGNAL(titleChanged(QString)), SLOT(setWindowTitle(QString)));
connect(webView(), SIGNAL(urlChanged(QUrl)), SLOT(urlChanged(QUrl)));
@@ -163,7 +163,7 @@
m_browser->load(string);
}
-void BrowserWindow::loadProgress(int progress)
+void BrowserWindow::onLoadProgressChanged(int progress)
{
QColor backgroundColor = QApplication::palette().color(QPalette::Base);
QColor progressColor = QColor(120, 180, 240);
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (92275 => 92276)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-08-03 13:05:46 UTC (rev 92275)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-08-03 13:15:39 UTC (rev 92276)
@@ -56,7 +56,7 @@
protected slots:
void changeLocation();
- void loadProgress(int progress);
+ void onLoadProgressChanged(int progress);
void urlChanged(const QUrl&);
void openFile();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
