Reviewed and landed by ap.

        Fix QtLauncher - it is supposed to create a FrameView on its own nowadays.

        * QtLauncher/main.cpp:
        (main):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index f4560525ceab89b6e0ff7dd26668bd14ae25be83..5836cceab9b2ccf1d15d053fdf2e58605c4d009a 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-10  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed and landed by ap.
+
+        Fix QtLauncher - it is supposed to create a FrameView on its own nowadays.
+
+        * QtLauncher/main.cpp:
+        (main):
+

 2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Tim H.
 2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Tim H.

diff --git a/WebKitQt/QtLauncher/main.cpp b/WebKitQt/QtLauncher/main.cpp
index 9f1a3f23a91d58a18f41ded5c72db327b425b0cb..9580b32da60a093e743b3ab9abd997c209fc974b 100644 (file)
--- a/WebKitQt/QtLauncher/main.cpp
+++ b/WebKitQt/QtLauncher/main.cpp
@@ -65,6 +65,10 @@ int main(int argc, char **argv)
     Page* page = new Page();
     Frame* frame = new FrameQt(page, 0, new FrameQtClientDefault());
 
     Page* page = new Page();
     Frame* frame = new FrameQt(page, 0, new FrameQtClientDefault());
 

+    FrameView* frameView = new FrameView(frame);
+    frame->setView(frameView);
+    frameView->setParentWidget(&topLevel);
+

     l->addWidget(frame->view()->qwidget());
     l->activate();
     frame->view()->qwidget()->show();
     l->addWidget(frame->view()->qwidget());
     l->activate();
     frame->view()->qwidget()->show();