Changeset 128558 in webkit


Ignore:
Timestamp:
Sep 13, 2012 10:53:37 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Make compile with both OS(WINCE) and PLATFORM(QT) support
​https://bugs.webkit.org/show_bug.cgi?id=95536

Patch by Kevin Funk <​kevin.funk@kdab.com> on 2012-09-13
Reviewed by Simon Hausmann.

Source/JavaScriptCore:

Do not link against advapi32 on wince

  • jsc.pro:

Source/WebCore:

  • WebCore.pri:

Set defines for the WinCE platform build

  • platform/graphics/BitmapImage.cpp:

Use default implementation in BitmapImage::reportMemoryUsage() when Qt support available

  • platform/graphics/GraphicsContext.cpp:

Same as above: use default implementation

  • platform/win/ClipboardUtilitiesWin.cpp:

Remove unnecessary include

Source/WTF:

Fixes for Windows CE.

  • WTF.pri:

Also include path for mt19937ar.c

  • wtf/unicode/icu/CollatorICU.cpp:

Fix undeclared strdup() on CE7

  • wtf/Platform.h:

Tools:

Fix wince support in qmake files

  • Tools.pro:
  • qmake/mkspecs/features/configure.prf:
  • qmake/mkspecs/features/default_post.prf:
  • qmake/mkspecs/features/features.prf:
  • qmake/mkspecs/features/functions.prf:
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r128544 r128558  
     12012-09-13  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Make compile with both OS(WINCE) and PLATFORM(QT) support
     4        https://bugs.webkit.org/show_bug.cgi?id=95536
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Do not link against advapi32 on wince
     9
     10        * jsc.pro:
     11
    1122012-09-13  Geoffrey Garen  <ggaren@apple.com>
    213

  • trunk/Source/JavaScriptCore/jsc.pro

    r104034 r128558  
    2424}
    2525
    26 win* {
     26win32-* {
    2727    LIBS += -ladvapi32
    2828}

  • trunk/Source/WTF/ChangeLog

    r128557 r128558  
     12012-09-13  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Make compile with both OS(WINCE) and PLATFORM(QT) support
     4        https://bugs.webkit.org/show_bug.cgi?id=95536
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Fixes for Windows CE.
     9
     10        * WTF.pri:
     11        Also include path for mt19937ar.c
     12        * wtf/unicode/icu/CollatorICU.cpp:
     13        Fix undeclared strdup() on CE7
     14        * wtf/Platform.h:
     15
    1162012-09-13  Byungseon Shin  <xingri@gmail.com>
    217

  • trunk/Source/WTF/WTF.pro

    r128153 r128558  
    1414
    1515INCLUDEPATH += $$PWD/wtf
     16
     17wince* {
     18    # for mt19937ar.c
     19    INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/ThirdParty
     20}
    1621
    1722HEADERS += \

  • trunk/Source/WTF/wtf/Platform.h

    r128174 r128558  
    523523#endif  /* OS(WINCE) && !PLATFORM(QT) */
    524524
    525 #if OS(WINCE)
     525#if OS(WINCE) && !PLATFORM(QT)
    526526#define WTF_USE_WCHAR_UNICODE 1
    527527#elif PLATFORM(GTK)

  • trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp

    r122669 r128558  
    3333
    3434#include <wtf/Assertions.h>
     35#include <wtf/StringExtras.h>
    3536#include <wtf/Threading.h>
    3637#include <unicode/ucol.h>

  • trunk/Source/WebCore/ChangeLog

    r128556 r128558  
     12012-09-13  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Make compile with both OS(WINCE) and PLATFORM(QT) support
     4        https://bugs.webkit.org/show_bug.cgi?id=95536
     5
     6        Reviewed by Simon Hausmann.
     7
     8        * WebCore.pri:
     9        Set defines for the WinCE platform build
     10        * platform/graphics/BitmapImage.cpp:
     11        Use default implementation in BitmapImage::reportMemoryUsage() when Qt support available
     12        * platform/graphics/GraphicsContext.cpp:
     13        Same as above: use default implementation
     14         * platform/win/ClipboardUtilitiesWin.cpp:
     15        Remove unnecessary include
     16
    1172012-09-13  Keishi Hattori  <keishi@webkit.org>
    218

  • trunk/Source/WebCore/WebCore.pri

    r128294 r128558  
    221221}
    222222
    223 win32-* {
     223win32 {
    224224    INCLUDEPATH += $$SOURCE_DIR/platform/win
    225     LIBS += -lgdi32
    226     LIBS += -lole32
    227     LIBS += -luser32
     225
     226    wince* {
     227        # see https://bugs.webkit.org/show_bug.cgi?id=43442
     228        DEFINES += HAVE_LOCALTIME_S=0
     229
     230        LIBS += -lmmtimer
     231        LIBS += -lole32
     232    }
     233    else {
     234        LIBS += -lgdi32
     235        LIBS += -lole32
     236        LIBS += -luser32
     237    }
    228238}
    229239
    … …  
    242252}
    243253
    244 wince* {
    245     DEFINES += HAVE_LOCALTIME_S=0
    246     LIBS += -lmmtimer
    247     LIBS += -lole32
    248 }
    249 
    250254mac {
    251255    LIBS_PRIVATE += -framework Carbon -framework AppKit

  • trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

    r128451 r128558  
    581581    info.addVector(m_frames);
    582582    for (unsigned i = 0; i < m_frameCount; ++i) {
    583 #if OS(WINCE)
     583#if OS(WINCE) && !PLATFORM(QT)
    584584        info.addRawBuffer(m_frames[i].m_frame.get(), m_frames[i].m_frameBytes);
    585585#else

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

    r127801 r128558  
    377377}
    378378
    379 #if !OS(WINCE)
     379#if !OS(WINCE) || PLATFORM(QT)
    380380void GraphicsContext::drawText(const Font& font, const TextRun& run, const FloatPoint& point, int from, int to)
    381381{

  • trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp

    r126968 r128558  
    3232#include "markup.h"
    3333#include <shlobj.h>
    34 #include <shlwapi.h>
    3534#include <wininet.h> // for INTERNET_MAX_URL_LENGTH
    3635#include <wtf/StringExtras.h>
    … …  
    3837#include <wtf/text/StringBuilder.h>
    3938#include <wtf/text/WTFString.h>
     39
     40#if !OS(WINCE)
     41#include <shlwapi.h>
     42#endif
    4043
    4144#if USE(CF)

  • trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

    r127862 r128558  
    645645bool EditorClientQt::supportsGlobalSelection()
    646646{
     647#ifndef QT_NO_CLIPBOARD
    647648    return qApp->clipboard()->supportsSelection();
     649#else
     650    return false;
     651#endif
    648652}
    649653

  • trunk/Tools/ChangeLog

    r128553 r128558  
     12012-09-13  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Make compile with both OS(WINCE) and PLATFORM(QT) support
     4        https://bugs.webkit.org/show_bug.cgi?id=95536
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Fix wince support in qmake files
     9
     10        * Tools.pro:
     11        * qmake/mkspecs/features/configure.prf:
     12        * qmake/mkspecs/features/default_post.prf:
     13        * qmake/mkspecs/features/features.prf:
     14        * qmake/mkspecs/features/functions.prf:
     15
    1162012-09-13  KwangYong Choi  <ky0.choi@samsung.com>
    217

  • trunk/Tools/qmake/mkspecs/features/configure.prf

    r128466 r128558  
    8787    }
    8888
     89    wince* {
     90        WEBKIT_CONFIG -= build_drt
     91    }
     92
    8993    production_build {
    9094        WEBKIT_CONFIG -= build_drt build_wtr build_tests

  • trunk/Tools/qmake/mkspecs/features/default_post.prf

    r128465 r128558  
    172172
    173173# For anyone trying to include stdint.h
    174 win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32
     174win32-msvc*|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32
    175175
    176176contains(QT, webkit) {

  • trunk/Tools/qmake/mkspecs/features/features.prf

    r128435 r128558  
    8080
    8181    # Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled.
    82     contains(QT_CONFIG, opengl) {
     82    # Disable on Windows CE for now, as ANGLE won't compile.
     83    !wince*:contains(QT_CONFIG, opengl) {
    8384        # On Windows we require GLES2/EGL through ANGLE.
    8485        !win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics
     86    }
     87
     88    # Temporarily disable FTPDIR on Windows CE (missing functions from time.h)
     89    wince* {
     90        WEBKIT_CONFIG -= ftpdir
    8591    }
    8692

  • trunk/Tools/qmake/mkspecs/features/functions.prf

    r128450 r128558  
    88defineReplace(toSanitizedPath) {
    99    path = $$1
    10     win32-msvc* {
     10    win32-msvc*|wince* {
    1111        components = $$split(path, :)
    1212        count(components, 2): path = $$lower($$first(components)):$$last(components)
Note: See TracChangeset for help on using the changeset viewer.