WebKitQt:

        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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7db16bdb0e061d4b3465a9c1815e402a97eb64e..62978731068e047d7e4bc66e317f72a6e02931f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index 6c74583f2e56cc4661a301007287e28181b10d1d..f4560525ceab89b6e0ff7dd26668bd14ae25be83 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,14 @@
+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.

diff --git a/WebKitTools/QtLauncher/CMakeLists.txt b/WebKitQt/QtLauncher/CMakeLists.txt
similarity index 100%
rename from WebKitTools/QtLauncher/CMakeLists.txt
rename to WebKitQt/QtLauncher/CMakeLists.txt

diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitQt/QtLauncher/main.cpp
similarity index 89%
rename from WebKitTools/QtLauncher/main.cpp
rename to WebKitQt/QtLauncher/main.cpp
index 6bc13392ccd1eaeb1e858762b5dcb9659c5b97af..9f1a3f23a91d58a18f41ded5c72db327b425b0cb 100644 (file)
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitQt/QtLauncher/main.cpp
@@ -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;
 }

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0e224366ae1bd75a8af164c326082085786d1be8..bd9c6b09a50556fc42a9671683b47b37797fb328 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+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.