Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	tools/qdoc3/test/qt-build-docs.qdocconf

1 files changed, 4 insertions, 1 deletions

diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkit/fancybrowser/mainwindow.h
index 33fd8f5..be95614 100644
--- a/examples/webkit/fancybrowser/mainwindow.h
+++ b/examples/webkit/fancybrowser/mainwindow.h
@@ -52,7 +52,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow();
+    MainWindow(const QUrl& url);
 
 protected slots:
 
@@ -62,6 +62,9 @@ protected slots:
     void setProgress(int p);
     void finishLoading(bool);
 
+    void viewSource();
+    void slotSourceDownloaded();
+
     void highlightAllLinks();
     void rotateImages(bool toggle);
     void removeGifImages();