Changeset 116304 in webkit


Ignore:
Timestamp:
May 7, 2012 5:58:21 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

Unreviewed, rolling out r116299, r116301, and r116303.
​http://trac.webkit.org/changeset/116299
​http://trac.webkit.org/changeset/116301
​http://trac.webkit.org/changeset/116303
​https://bugs.webkit.org/show_bug.cgi?id=85795

Build is still broken (Requested by Ossy on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-05-07

Source/WebKit2:

  • qt/MainQt.cpp:

(main):

Tools:

  • DumpRenderTree/qt/DumpRenderTree.pro:
  • DumpRenderTree/qt/main.cpp:

(main):

  • QtTestPlatformPlugin/QtTestPlatformPlugin.pro: Removed.
  • QtTestPlatformPlugin/TestIntegration.cpp: Removed.
  • QtTestPlatformPlugin/TestIntegration.h: Removed.
  • QtTestPlatformPlugin/mac/TestFontDatabase.h: Removed.
  • QtTestPlatformPlugin/mac/TestFontDatabase.mm: Removed.
  • QtTestPlatformPlugin/mac/TestIntegrationMac.mm: Removed.
  • QtTestPlatformPlugin/main.cpp: Removed.
  • QtTestPlatformPlugin/testplatform.json: Removed.
  • Tools.pro:
  • WebKitTestRunner/Target.pri:
  • WebKitTestRunner/qt/main.cpp:

(main):

Location:
trunk
Files:
8 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r116299 r116304  
     12012-05-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r116299, r116301, and r116303.
     4        http://trac.webkit.org/changeset/116299
     5        http://trac.webkit.org/changeset/116301
     6        http://trac.webkit.org/changeset/116303
     7        https://bugs.webkit.org/show_bug.cgi?id=85795
     8
     9        Build is still broken (Requested by Ossy on #webkit).
     10
     11        * qt/MainQt.cpp:
     12        (main):
     13
    1142012-05-07  Balazs Kelemen  <kbalazs@webkit.org>
    215

  • trunk/Source/WebKit2/qt/MainQt.cpp

    r116299 r116304  
    2626
    2727#include <QApplication>
    28 #include <QByteArray>
    29 #include <QFile>
    30 #include <QPlatformIntegration>
    31 #include <QPlatformIntegrationPlugin>
    32 #include <QPluginLoader>
     28
    3329#include <stdio.h>
    3430
    … …  
    4844}
    4945
    50 static void initializeTestPlatformPluginForWTRIfRequired()
    51 {
    52     QByteArray pluginPath = qgetenv("QT_WEBKIT2_TEST_PLATFORM_PLUGIN_PATH");
    53     if (pluginPath.isEmpty())
    54         return;
    55 
    56     QPluginLoader loader(QFile::decodeName(pluginPath.data()));
    57     QPlatformIntegrationPlugin* plugin = qobject_cast<QPlatformIntegrationPlugin*>(loader.instance());
    58     if (!plugin)
    59         qFatal("cannot initialize test platform plugin\n");
    60 
    61     qputenv("QT_QPA_PLATFORM_PLUGIN_PATH", pluginPath);
    62     qputenv("QT_QPA_PLATFORM", "testplatform");
    63 }
    64 
    6546// The framework entry point.
    6647// We call our platform specific entry point directly rather than WebKitMain because it makes little sense
    … …  
    7657#endif
    7758
    78     initializeTestPlatformPluginForWTRIfRequired();
    7959    WebKit::initializeWebKit2Theme();
    8060

  • trunk/Tools/ChangeLog

    r116303 r116304  
     12012-05-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r116299, r116301, and r116303.
     4        http://trac.webkit.org/changeset/116299
     5        http://trac.webkit.org/changeset/116301
     6        http://trac.webkit.org/changeset/116303
     7        https://bugs.webkit.org/show_bug.cgi?id=85795
     8
     9        Build is still broken (Requested by Ossy on #webkit).
     10
     11        * DumpRenderTree/qt/DumpRenderTree.pro:
     12        * DumpRenderTree/qt/main.cpp:
     13        (main):
     14        * QtTestPlatformPlugin/QtTestPlatformPlugin.pro: Removed.
     15        * QtTestPlatformPlugin/TestIntegration.cpp: Removed.
     16        * QtTestPlatformPlugin/TestIntegration.h: Removed.
     17        * QtTestPlatformPlugin/mac/TestFontDatabase.h: Removed.
     18        * QtTestPlatformPlugin/mac/TestFontDatabase.mm: Removed.
     19        * QtTestPlatformPlugin/mac/TestIntegrationMac.mm: Removed.
     20        * QtTestPlatformPlugin/main.cpp: Removed.
     21        * QtTestPlatformPlugin/testplatform.json: Removed.
     22        * Tools.pro:
     23        * WebKitTestRunner/Target.pri:
     24        * WebKitTestRunner/qt/main.cpp:
     25        (main):
     26
    1272012-05-07  Balazs Kelemen  <kbalazs@webkit.org>
    228

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r116299 r116304  
    5858DEFINES += USE_SYSTEM_MALLOC=1
    5959
    60 mac: LIB_SUFFIX=.dylib
    61 win: LIB_SUFFIX=.dll
    62 unix:!mac: LIB_SUFFIX=.so
    63 DEFINES += TEST_PLATFORM_PLUGIN_PATH=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}lib$${QMAKE_DIR_SEP}libtestplatform$${LIB_SUFFIX}\\\"\"
    64 
    6560RESOURCES = DumpRenderTree.qrc

  • trunk/Tools/DumpRenderTree/qt/main.cpp

    r116303 r116304  
    3232#include "QtInitializeTestFonts.h"
    3333
    34 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    35 #include <QPlatformIntegration>
    36 #include <QPlatformIntegrationPlugin>
    37 #include <QPluginLoader>
    38 #endif
    39 
    4034#include <wtf/AlwaysInline.h>
    4135
    … …  
    130124#endif
    131125
    132 static void initializeTestPlatformPlugin(int argc, char* const argv[])
    133 {
    134 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    135     QPluginLoader loader(TEST_PLATFORM_PLUGIN_PATH);
    136     QPlatformIntegrationPlugin* plugin = qobject_cast<QPlatformIntegrationPlugin*>(loader.instance());
    137     if (!plugin)
    138         qFatal("cannot initialize test platform plugin\n");
    139 
    140     QByteArray platform = qgetenv("QT_QPA_PLATFORM");
    141     QByteArray platformPluginPath = qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH");
    142     for (int i = 0; i < argc; ++i) {
    143         if (QByteArray(argv[i]) == "-platform" && i + 1 < argc)
    144             platform = argv[i + 1];
    145         else if (QByteArray(argv[i]) == "-platformpluginpath" && i + 1 < argc)
    146             platformPluginPath = argv[i + 1];
    147     }
    148     if (!platform.isEmpty())
    149         qputenv("QT_WEBKIT_ORIGINAL_PLATFORM", platform);
    150     if (!platformPluginPath.isEmpty())
    151         qputenv("QT_WEBKIT_ORIGINAL_PLATFORM_PLUGIN_PATH", platformPluginPath);
    152 
    153     qputenv("QT_QPA_PLATFORM_PLUGIN_PATH", TEST_PLATFORM_PLUGIN_PATH);
    154     qputenv("QT_QPA_PLATFORM", "testplatform");
    155 #endif
    156 }
    157 
    158126int main(int argc, char* argv[])
    159127{
    … …  
    178146
    179147    WebKit::initializeTestFonts();
    180 
    181     initializeTestPlatformPlugin(argc, argv);
    182148
    183149    QApplication::setGraphicsSystem("raster");

  • trunk/Tools/Tools.pro

    r116299 r116304  
    1313SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
    1414SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
    15 
    16 haveQt(5): SUBDIRS += QtTestPlatformPlugin/QtTestPlatformPlugin.pro
    1715
    1816!no_webkit2 {

  • trunk/Tools/WebKitTestRunner/Target.pri

    r116299 r116304  
    3838*-clang*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
    3939
    40 mac: LIB_SUFFIX=.dylib
    41 win: LIB_SUFFIX=.dll
    42 unix:!mac: LIB_SUFFIX=.so
    43 DEFINES += TEST_PLATFORM_PLUGIN_PATH=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}lib$${QMAKE_DIR_SEP}libtestplatform$${LIB_SUFFIX}\\\"\"
    44 
    4540RESOURCES = qt/WebKitTestRunner.qrc

  • trunk/Tools/WebKitTestRunner/qt/main.cpp

    r116299 r116304  
    103103    qputenv("QT_WEBKIT_THEME_NAME", "qstyle");
    104104
    105     QByteArray platform = qgetenv("QT_QPA_PLATFORM");
    106     QByteArray platformPluginPath = qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH");
    107     for (int i = 0; i < argc; ++i) {
    108         if (QByteArray(argv[i]) == "-platform" && i + 1 < argc)
    109             platform = argv[i + 1];
    110         else if (QByteArray(argv[i]) == "-platformpluginpath" && i + 1 < argc)
    111             platformPluginPath = argv[i + 1];
    112     }
    113     if (!platform.isEmpty())
    114         qputenv("QT_WEBKIT_ORIGINAL_PLATFORM", platform);
    115     if (!platformPluginPath.isEmpty())
    116         qputenv("QT_WEBKIT_ORIGINAL_PLATFORM_PLUGIN_PATH", platformPluginPath);
    117 
    118     // Tell the web process that we want to use the test platform plugin.
    119     qputenv("QT_WEBKIT2_TEST_PLATFORM_PLUGIN_PATH", TEST_PLATFORM_PLUGIN_PATH);
    120 
    121105    QQuickWebViewExperimental::setFlickableViewportEnabled(false);
    122106    QApplication app(argc, argv);
Note: See TracChangeset for help on using the changeset viewer.