[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156658 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7530ae1f
2013-09-30 Allan Sandfeld Jensen <allan.jensen@digia.com>
[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:
2013-09-26 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
[GTK] Tons of warnings caused by using FORTIFY_SOURCE in an unoptimized build
......
2013-09-30 Allan Sandfeld Jensen <allan.jensen@digia.com>
[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
* Target.pri:
* WebKit2.pro:
* WebKit2QML.pri: Removed.
2013-09-29 Mark Rowe <mrowe@apple.com>
Fix the Lion build.
......
......@@ -793,6 +793,8 @@ have?(QTQUICK) {
UIProcess/API/qt/qwebnavigationrequest_p.h \
UIProcess/API/qt/qquickwebpage_p.h \
UIProcess/API/qt/qquickwebpage_p_p.h \
UIProcess/API/qt/qwebnavigationhistory_p.h \
UIProcess/API/qt/qwebnavigationhistory_p_p.h \
UIProcess/API/qt/qquickwebview_p.h \
UIProcess/API/qt/qquickwebview_p_p.h \
UIProcess/API/qt/qquicknetworkreply_p.h \
......@@ -825,6 +827,7 @@ have?(QTQUICK) {
UIProcess/API/qt/qwebloadrequest.cpp \
UIProcess/API/qt/qwebnavigationrequest.cpp \
UIProcess/API/qt/qquickwebpage.cpp \
UIProcess/API/qt/qwebnavigationhistory.cpp \
UIProcess/API/qt/qquickwebview.cpp \
UIProcess/API/qt/qwebiconimageprovider.cpp \
UIProcess/API/qt/qquicknetworkreply.cpp \
......
......@@ -12,8 +12,3 @@ target.file = Target.pri
SUBDIRS += derived_sources target
addStrictSubdirOrderBetween(derived_sources, target)
have?(QTQUICK) {
webkit2qml.file = WebKit2QML.pri
SUBDIRS += webkit2qml
}
# -------------------------------------------------------------------
# Target file for the WebKit2 QML static library
#
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
TEMPLATE = lib
TARGET = WebKit2QML
WEBKIT += wtf javascriptcore webcore webkit2
load(webkit_modules)
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit2
# Remove include paths that point to directories containing
# internal API, to prevent the accidental inclusion.
INCLUDEPATH -= \
$$SOURCE_DIR \
$$SOURCE_DIR/Platform \
$$SOURCE_DIR/Platform/CoreIPC \
$$SOURCE_DIR/Platform/qt \
$$SOURCE_DIR/Shared \
$$SOURCE_DIR/Shared/linux/SandboxProcess \
$$SOURCE_DIR/Shared/Authentication \
$$SOURCE_DIR/Shared/CoordinatedGraphics \
$$SOURCE_DIR/Shared/CoreIPCSupport \
$$SOURCE_DIR/Shared/Downloads \
$$SOURCE_DIR/Shared/Downloads/qt \
$$SOURCE_DIR/Shared/Network \
$$SOURCE_DIR/Shared/Plugins \
$$SOURCE_DIR/Shared/Plugins/Netscape \
$$SOURCE_DIR/Shared/qt \
$$SOURCE_DIR/UIProcess \
$$SOURCE_DIR/UIProcess/API/qt \
$$SOURCE_DIR/UIProcess/Authentication \
$$SOURCE_DIR/UIProcess/CoordinatedGraphics \
$$SOURCE_DIR/UIProcess/Downloads \
$$SOURCE_DIR/UIProcess/InspectorServer \
$$SOURCE_DIR/UIProcess/InspectorServer/qt \
$$SOURCE_DIR/UIProcess/Launcher \
$$SOURCE_DIR/UIProcess/Notifications \
$$SOURCE_DIR/UIProcess/Plugins \
$$SOURCE_DIR/UIProcess/Storage \
$$SOURCE_DIR/UIProcess/qt \
$$SOURCE_DIR/UIProcess/texmap \
$$SOURCE_DIR/WebProcess \
$$SOURCE_DIR/WebProcess/ApplicationCache \
$$SOURCE_DIR/WebProcess/Battery \
$$SOURCE_DIR/WebProcess/Cookies \
$$SOURCE_DIR/WebProcess/Cookies/qt \
$$SOURCE_DIR/WebProcess/FullScreen \
$$SOURCE_DIR/WebProcess/Geolocation \
$$SOURCE_DIR/WebProcess/IconDatabase \
$$SOURCE_DIR/WebProcess/InjectedBundle \
$$SOURCE_DIR/WebProcess/InjectedBundle/DOM \
$$SOURCE_DIR/WebProcess/InjectedBundle/API/c \
$$SOURCE_DIR/WebProcess/MediaCache \
$$SOURCE_DIR/WebProcess/NetworkInfo \
$$SOURCE_DIR/WebProcess/Notifications \
$$SOURCE_DIR/WebProcess/Plugins \
$$SOURCE_DIR/WebProcess/Plugins/Netscape \
$$SOURCE_DIR/WebProcess/ResourceCache \
$$SOURCE_DIR/WebProcess/Storage \
$$SOURCE_DIR/WebProcess/WebCoreSupport \
$$SOURCE_DIR/WebProcess/WebCoreSupport/qt \
$$SOURCE_DIR/WebProcess/WebPage \
$$SOURCE_DIR/WebProcess/WebPage/CoordinatedGraphics \
$$SOURCE_DIR/WebProcess/qt \
$$SOURCE_DIR/PluginProcess
CONFIG += staticlib
SOURCES += \
UIProcess/API/qt/qwebnavigationhistory.cpp
HEADERS += \
UIProcess/API/qt/qwebnavigationhistory_p.h \
UIProcess/API/qt/qwebnavigationhistory_p_p.h
......@@ -15,10 +15,7 @@ WEBKIT_DESTDIR = $${ROOT_BUILD_DIR}/lib
WEBKIT += wtf javascriptcore webcore
build?(webkit1): WEBKIT += webkit1
build?(webkit2) {
WEBKIT += webkit2
have?(QTQUICK): WEBKIT += webkit2qml
}
build?(webkit2): WEBKIT += webkit2
# Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this
# file, which in turn runs syncqt to update the forwarding headers.
......
2013-09-30 Allan Sandfeld Jensen <allan.jensen@digia.com>
[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
* qmake/mkspecs/features/webkit_modules.prf:
* qmake/mkspecs/modules/webkit2qml.prf: Removed.
2013-09-30 Krzysztof Wolanski <k.wolanski@samsung.com>
[EFL] Fix incorrect click counting in EventSenderProxy
......
......@@ -7,7 +7,7 @@
# Reorder libraries so that the link and include order is correct,
# and make sure the case matches the original case.
libraries = WebKit1 WebKit2QML WebKit2 WebCore ANGLE JavaScriptCore WTF
libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF
for(library, libraries) {
contains(WEBKIT, $$lower($$library)) {
WEBKIT -= $$lower($$library)
......
# -------------------------------------------------------------------
# Module file for WebKit2, used by targets that depend on WebKit2
#
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
WEBKIT.webkit2qml.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WebKit2
#include($${WEBKIT.webkit2.root_source_dir}/WebKit2QML.pri)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment