WebKitQt:
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Sep 2006 22:28:29 +0000 (22:28 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Sep 2006 22:28:29 +0000 (22:28 +0000)
        Reviewed by Tim H.

        Fixes last part of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644
        Move QtLauncher down to WebKitQt.

        * QtLauncher/CMakeLists.txt: Added.
        * QtLauncher/main.cpp: Added.
        (main):

WebKitTools:

        Reviewed by Tim H.

        Fixes last part of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644
        Move QtLauncher down to WebKitQt.

        * QtLauncher/CMakeLists.txt: Removed.
        * QtLauncher/main.cpp: Removed.

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

CMakeLists.txt
WebKitQt/ChangeLog
WebKitQt/QtLauncher/CMakeLists.txt [moved from WebKitTools/QtLauncher/CMakeLists.txt with 100% similarity]
WebKitQt/QtLauncher/main.cpp [moved from WebKitTools/QtLauncher/main.cpp with 89% similarity]
WebKitTools/ChangeLog

index c7db16b..6297873 100644 (file)
@@ -56,6 +56,8 @@ add_subdirectory (JavaScriptCore)
 add_subdirectory (WebCore)
 add_subdirectory (WebKitTools/DumpRenderTree/DumpRenderTree.qtproj)
 
+add_subdirectory (WebKitQt/QtLauncher)
+
 IF (WEBKIT_USE_KDE_SUPPORT)
     add_subdirectory (WebKitQt/WebKitPart)
 ENDIF (WEBKIT_USE_KDE_SUPPORT)
index 6c74583..f456052 100644 (file)
@@ -1,5 +1,16 @@
 2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
 
+        Reviewed by Tim H.
+
+        Fixes last part of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644
+        Move QtLauncher down to WebKitQt.
+
+        * QtLauncher/CMakeLists.txt: Added.
+        * QtLauncher/main.cpp: Added.
+        (main):
+
+2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
+
         Reviewed by Darin. Final polish by Sam.
 
         Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644
similarity index 89%
rename from WebKitTools/QtLauncher/main.cpp
rename to WebKitQt/QtLauncher/main.cpp
index 6bc1339..9f1a3f2 100644 (file)
@@ -60,12 +60,14 @@ int main(int argc, char **argv)
      
     QWidget topLevel;
     QBoxLayout *l = new QVBoxLayout(&topLevel);
-        
-    FrameQt *f = new FrameQt(&topLevel);
+    // Initialize WebCore in Qt platform mode...
+    Page* page = new Page();
+    Frame* frame = new FrameQt(page, 0, new FrameQtClientDefault());
 
-    l->addWidget(f->view()->qwidget());
+    l->addWidget(frame->view()->qwidget());
     l->activate();
-    f->view()->qwidget()->show();
+    frame->view()->qwidget()->show();
 
     topLevel.show();
 
@@ -76,9 +78,9 @@ int main(int argc, char **argv)
     else
         url = args->arg(0);
 
-    f->openURL(KURL(url.toLatin1()));
+    frame->openURL(KURL(url.toLatin1()));
     
     app.exec();
-    delete f;
+    delete frame;
     return 0;
 }
index 0e22436..bd9c6b0 100644 (file)
@@ -1,5 +1,15 @@
 2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
 
+        Reviewed by Tim H.
+
+        Fixes last part of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644
+        Move QtLauncher down to WebKitQt.
+
+        * QtLauncher/CMakeLists.txt: Removed.
+        * QtLauncher/main.cpp: Removed.
+
+2006-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
+
         Reviewed by Darin.
 
         Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10644