Changeset 63968 in webkit


Ignore:
Timestamp:
Jul 23, 2010 6:39:33 AM (14 years ago)
Author:
abecsi@webkit.org
Message:

2010-07-23 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Setup the QtWebProcess

​https://bugs.webkit.org/show_bug.cgi?id=42623

  • WebCore.pro: Added WebProcessMainQt.cpp to SOURCES.

2010-07-23 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Setup the QtWebProcess

​https://bugs.webkit.org/show_bug.cgi?id=42623

  • WebKit.pro: Add WebKit2.pro to the build guarded by webkit2 config variable.

2010-07-19 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Setup the QtWebProcess

​https://bugs.webkit.org/show_bug.cgi?id=42623

  • UIProcess/Launcher/qt/ProcessLauncherQt.cpp: Remove the framework entry point from here to WebProcess/qt/WebProcessMainQt.cpp to match with with the mac and the win port.
  • WebKit2.pro: Added.
  • WebProcess/qt/WebProcessMainQt.cpp: Added. (WebKit::WebProcessMainQt): Framework entry point for Qt.
  • qt/MainQt.cpp: Added. (main):
Location:
trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r63768 r63968  
     12010-07-23  Balazs Kelemen  <kb@inf.u-szeged.hu>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Setup the QtWebProcess
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=42623
     8
     9        * WebKit.pro: Add WebKit2.pro to the build guarded by webkit2 config variable.
     10
    1112010-07-20  Rafael Antognolli  <antognolli@profusion.mobi>
    212

  • trunk/WebCore/ChangeLog

    r63967 r63968  
     12010-07-23  Balazs Kelemen  <kb@inf.u-szeged.hu>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Setup the QtWebProcess
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=42623
     8
     9        * WebCore.pro: Added WebProcessMainQt.cpp to SOURCES.
     10
    1112010-07-23  Pavel Feldman  <pfeldman@chromium.org>
    212

  • trunk/WebCore/WebCore.pro

    r63927 r63968  
    33673367    ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
    33683368    ../WebKit2/WebProcess/WebProcess.cpp \
     3369    ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp
    33693370
    33703371}

  • trunk/WebKit.pro

    r63277 r63968  
    2929}
    3030
     31webkit2 {
     32    exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
     33}
     34
    3135symbian {
    3236    # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian

  • trunk/WebKit2/ChangeLog

    r63949 r63968  
     12010-07-19 Balazs Kelemen <kb@inf.u-szeged.hu>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Setup the QtWebProcess
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=42623
     8
     9        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
     10        Remove the framework entry point from here to WebProcess/qt/WebProcessMainQt.cpp to match with with the mac and the win port.
     11        * WebKit2.pro: Added.
     12        * WebProcess/qt/WebProcessMainQt.cpp: Added.
     13        (WebKit::WebProcessMainQt): Framework entry point for Qt.
     14        * qt/MainQt.cpp: Added.
     15        (main):
     16
    1172010-07-22  Darin Adler  <darin@apple.com>
    218

  • trunk/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

    r63206 r63968  
    3636#include <wtf/Threading.h>
    3737
    38 #if USE(MEEGOTOUCH)
    39 #include <meegotouch/MComponentData>
    40 #endif
    41 
    4238#include <QApplication>
    4339#include <QDebug>
    … …  
    4945#include <sys/resource.h>
    5046#include <unistd.h>
    51 
    52 #if !defined(QWEBKIT_EXPORT)
    53 #  if defined(QT_SHARED)
    54 #    define QWEBKIT_EXPORT Q_DECL_EXPORT
    55 #  else
    56 #    define QWEBKIT_EXPORT
    57 #  endif
    58 #endif
    5947
    6048using namespace WebCore;
    … …  
    174162} // namespace WebKit
    175163
    176 QWEBKIT_EXPORT int webProcessMain(int argc, char** argv)
    177 {
    178     QApplication* app = new QApplication(argc, argv);
    179 
    180 #if USE(MEEGOTOUCH)
    181     new MComponentData(argc, argv);
    182 #endif
    183 
    184     srandom(time(0));
    185 
    186     JSC::initializeThreading();
    187     WTF::initializeMainThread();
    188     RunLoop::initializeMainRunLoop();
    189 
    190     // Create the connection.
    191     QString identifier(app->arguments().size() > 1 ? app->arguments().at(1) : "");
    192     WebKit::WebProcess::shared().initialize(identifier, RunLoop::main());
    193 
    194     RunLoop::run();
    195 
    196     // FIXME: Do more cleanup here.
    197 
    198     return 0;
    199 }
    200 
    201164#include "ProcessLauncherQt.moc"
Note: See TracChangeset for help on using the changeset viewer.