Changeset 156658 in webkit


Ignore:
Timestamp:
Sep 30, 2013 9:30:46 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

[Qt] Fix force_static_libs_as_shared in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=121961

Reviewed by Csaba Osztrogonác.

Get rid of the unused WebKit2QML library

.:

  • Source/api.pri:

Source/WebKit2:

  • Target.pri:
  • WebKit2.pro:
  • WebKit2QML.pri: Removed.

Tools:

  • qmake/mkspecs/features/webkit_modules.prf:
  • qmake/mkspecs/modules/webkit2qml.prf: Removed.
Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r156462 r156658  
     12013-09-30  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix force_static_libs_as_shared in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=121961
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Get rid of the unused WebKit2QML library
     9
     10        * Source/api.pri:
     11
    1122013-09-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
    213

  • trunk/Source/WebKit2/ChangeLog

    r156631 r156658  
     12013-09-30  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix force_static_libs_as_shared in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=121961
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Get rid of the unused WebKit2QML library
     9
     10        * Target.pri:
     11        * WebKit2.pro:
     12        * WebKit2QML.pri: Removed.
     13
    1142013-09-29  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/Source/WebKit2/Target.pri

    r156395 r156658  
    794794        UIProcess/API/qt/qquickwebpage_p.h \
    795795        UIProcess/API/qt/qquickwebpage_p_p.h \
     796        UIProcess/API/qt/qwebnavigationhistory_p.h \
     797        UIProcess/API/qt/qwebnavigationhistory_p_p.h \
    796798        UIProcess/API/qt/qquickwebview_p.h \
    797799        UIProcess/API/qt/qquickwebview_p_p.h \
    … …  
    826828        UIProcess/API/qt/qwebnavigationrequest.cpp \
    827829        UIProcess/API/qt/qquickwebpage.cpp \
     830        UIProcess/API/qt/qwebnavigationhistory.cpp \
    828831        UIProcess/API/qt/qquickwebview.cpp \
    829832        UIProcess/API/qt/qwebiconimageprovider.cpp \

  • trunk/Source/WebKit2/WebKit2.pro

    r156535 r156658  
    1313
    1414addStrictSubdirOrderBetween(derived_sources, target)
    15 
    16 have?(QTQUICK) {
    17     webkit2qml.file = WebKit2QML.pri
    18     SUBDIRS += webkit2qml
    19 }

  • trunk/Source/api.pri

    r155034 r156658  
    1616
    1717build?(webkit1): WEBKIT += webkit1
    18 build?(webkit2) {
    19     WEBKIT += webkit2
    20     have?(QTQUICK): WEBKIT += webkit2qml
    21 }
     18build?(webkit2): WEBKIT += webkit2
    2219
    2320# Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this

  • trunk/Tools/ChangeLog

    r156647 r156658  
     12013-09-30  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix force_static_libs_as_shared in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=121961
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Get rid of the unused WebKit2QML library
     9
     10        * qmake/mkspecs/features/webkit_modules.prf:
     11        * qmake/mkspecs/modules/webkit2qml.prf: Removed.
     12
    1132013-09-30  Krzysztof Wolanski  <k.wolanski@samsung.com>
    214

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

    r141430 r156658  
    88# Reorder libraries so that the link and include order is correct,
    99# and make sure the case matches the original case.
    10 libraries = WebKit1 WebKit2QML WebKit2 WebCore ANGLE JavaScriptCore WTF
     10libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF
    1111for(library, libraries) {
    1212    contains(WEBKIT, $$lower($$library)) {
Note: See TracChangeset for help on using the changeset viewer.