Diff
Modified: trunk/ChangeLog (131299 => 131300)
--- trunk/ChangeLog 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/ChangeLog 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,15 @@
+2012-10-15 Simon Hausmann <[email protected]>
+
+ [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
+ https://bugs.webkit.org/show_bug.cgi?id=88162
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Rename the QtWebKit module to QtWebKitWidgets.
+
+ * Source/api.pri:
+ * Source/sync.profile:
+
2012-10-14 Patrick Gansterer <[email protected]>
Unreviewed, rolling out r130656.
Modified: trunk/Source/WebKit/qt/ChangeLog (131299 => 131300)
--- trunk/Source/WebKit/qt/ChangeLog 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,18 @@
+2012-10-15 Simon Hausmann <[email protected]>
+
+ [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
+ https://bugs.webkit.org/show_bug.cgi?id=88162
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Rename the QtWebKit module to QtWebKitWidgets.
+
+ * declarative/experimental/experimental.pri:
+ * declarative/public.pri:
+ * docs/webkitsnippets/simple/simple.pro:
+ * docs/webkitsnippets/webpage/webpage.pro:
+ * tests/tests.pri:
+
2012-10-10 Jon Lee <[email protected]>
[WK2] Activate plugins when user clicks on snapshot
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (131299 => 131300)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -24,7 +24,7 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += widgets network quick quick-private webkit webkit-private
+QT += widgets network quick quick-private webkitwidgets webkitwidgets-private
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
Modified: trunk/Source/WebKit/qt/declarative/public.pri (131299 => 131300)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -24,7 +24,7 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += webkit webkit-private widgets quick quick-private
+QT += webkitwidgets webkitwidgets-private widgets quick quick-private
WEBKIT += wtf
Modified: trunk/Source/WebKit/qt/docs/webkitsnippets/simple/simple.pro (131299 => 131300)
--- trunk/Source/WebKit/qt/docs/webkitsnippets/simple/simple.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/docs/webkitsnippets/simple/simple.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,2 +1,2 @@
-QT += webkit
+QT += webkitwidgets
SOURCES = main.cpp
Modified: trunk/Source/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro (131299 => 131300)
--- trunk/Source/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,3 @@
CONFIG += console
-QT += webkit
-SOURCES = main.cpp
\ No newline at end of file
+QT += webkitwidgets
+SOURCES = main.cpp
Modified: trunk/Source/WebKit/qt/tests/tests.pri (131299 => 131300)
--- trunk/Source/WebKit/qt/tests/tests.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit/qt/tests/tests.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -16,7 +16,7 @@
$$PWD \
$$PWD/../Api
-QT += testlib network webkit widgets
+QT += testlib network webkitwidgets widgets
# This define is used by some tests to look up resources in the source tree
DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
Modified: trunk/Source/WebKit2/ChangeLog (131299 => 131300)
--- trunk/Source/WebKit2/ChangeLog 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,22 @@
+2012-10-15 Simon Hausmann <[email protected]>
+
+ [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
+ https://bugs.webkit.org/show_bug.cgi?id=88162
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Rename the QtWebKit module to QtWebKitWidgets.
+
+ * PluginProcess.pro:
+ * UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro:
+ * UIProcess/API/qt/tests/publicapi/publicapi.pro:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
+ * UIProcess/API/qt/tests/qmltests/WebView.pro:
+ * UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro:
+ * UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro:
+ * UIProcess/API/qt/tests/tests.pri:
+ * WebProcess.pro:
+
2012-10-15 Mikhail Pozdnyakov <[email protected]>
[EFL][WK2] Encapsulate ref counting for Ewk objects in a parent class
Modified: trunk/Source/WebKit2/PluginProcess.pro (131299 => 131300)
--- trunk/Source/WebKit2/PluginProcess.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/PluginProcess.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -6,7 +6,7 @@
TEMPLATE = app
-QT += webkit
+QT += webkitwidgets
TARGET = QtWebPluginProcess
DESTDIR = $${ROOT_BUILD_DIR}/bin
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,4 +1,4 @@
include(../tests.pri)
SOURCES += $${TARGET}.cpp
-QT += webkit-private
+QT += webkitwidgets-private
DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,3 @@
include(../tests.pri)
SOURCES += $${TARGET}.cpp
-QT += webkit-private
+QT += webkitwidgets-private
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -3,7 +3,7 @@
TARGET = tst_qmltests_DesktopBehavior
OBJECTS_DIR = obj_DesktopBehavior/$$activeBuildConfig()
-QT += webkit-private
+QT += webkitwidgets-private
CONFIG += warn_on testcase
QT += qmltest
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -3,7 +3,7 @@
TARGET = tst_qmltests_WebView
OBJECTS_DIR = obj_WebView/$$activeBuildConfig()
-QT += webkit-private
+QT += webkitwidgets-private
CONFIG += warn_on testcase
QT += qmltest
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,4 +1,4 @@
include(../tests.pri)
SOURCES += $${TARGET}.cpp
-QT += webkit-private
+QT += webkitwidgets-private
DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,3 @@
include(../tests.pri)
SOURCES += $${TARGET}.cpp
-QT += webkit-private
+QT += webkitwidgets-private
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri (131299 => 131300)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -6,7 +6,7 @@
INCLUDEPATH += $$PWD
SOURCES += ../util.cpp
-QT += testlib webkit
+QT += testlib webkitwidgets
have?(QTQUICK) {
QT += qml quick quick-private
HEADERS += ../bytearraytestdata.h \
Modified: trunk/Source/WebKit2/WebProcess.pro (131299 => 131300)
--- trunk/Source/WebKit2/WebProcess.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/WebKit2/WebProcess.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -11,7 +11,7 @@
SOURCES += qt/MainQt.cpp
-QT += network webkit widgets
+QT += network webkitwidgets widgets
macx: QT += xml
contains(QT_CONFIG, opengl) {
Modified: trunk/Source/api.pri (131299 => 131300)
--- trunk/Source/api.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/api.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -8,7 +8,7 @@
load(qt_build_config)
TEMPLATE = lib
-TARGET = QtWebKit
+TARGET = QtWebKitWidgets
WEBKIT_DESTDIR = $${ROOT_BUILD_DIR}/lib
@@ -24,7 +24,7 @@
use?(3D_GRAPHICS): WEBKIT += angle
-MODULE = webkit
+MODULE = webkitwidgets
# This is the canonical list of dependencies for the public API of
# the QtWebKit library, and will end up in the library's prl file.
Modified: trunk/Source/sync.profile (131299 => 131300)
--- trunk/Source/sync.profile 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Source/sync.profile 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,8 +1,8 @@
%modules = ( # path to module name map
- "QtWebKit" => "$basedir"
+ "QtWebKitWidgets" => "$basedir"
);
%moduleheaders = ( # restrict the module headers to those found in relative path
- "QtWebKit" => "WebKit/qt/Api;WebKit2/UIProcess/API/qt",
+ "QtWebKitWidgets" => "WebKit/qt/Api;WebKit2/UIProcess/API/qt",
);
%classnames = (
);
Modified: trunk/Tools/ChangeLog (131299 => 131300)
--- trunk/Tools/ChangeLog 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/ChangeLog 2012-10-15 14:06:06 UTC (rev 131300)
@@ -1,3 +1,24 @@
+2012-10-15 Simon Hausmann <[email protected]>
+
+ [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
+ https://bugs.webkit.org/show_bug.cgi?id=88162
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Rename the QtWebKit module to QtWebKitWidgets.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * MiniBrowser/qt/raw/Target.pri:
+ * QtTestBrowser/QtTestBrowser.pro:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort._path_to_webcore_library):
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * WebKitTestRunner/Target.pri:
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/webkit_modules.prf:
+ * qmake/mkspecs/features/win32/default_post.prf:
+
2012-10-11 Kinuko Yasuda <[email protected]>
[chromium] Removes unnecessary dependencies in DumpRenderTree.gyp
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (131299 => 131300)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -17,7 +17,7 @@
$${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
$${ROOT_WEBKIT_DIR}/Source/WTF
-QT = core gui network testlib webkit widgets
+QT = core gui network testlib webkitwidgets widgets
have?(QTPRINTSUPPORT): QT += printsupport
macx: QT += xml
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (131299 => 131300)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -31,7 +31,7 @@
have?(FONTCONFIG): PKGCONFIG += fontconfig
-QT += network gui-private quick quick-private webkit webkit-private
+QT += network gui-private quick quick-private webkitwidgets webkitwidgets-private
macx: QT += xml
RESOURCES += MiniBrowser.qrc
Modified: trunk/Tools/MiniBrowser/qt/raw/Target.pri (131299 => 131300)
--- trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -9,6 +9,6 @@
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT = core gui network webkit
+QT = core gui network webkitwidgets
WEBKIT += wtf _javascript_core webkit2
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (131299 => 131300)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-10-15 14:06:06 UTC (rev 131300)
@@ -42,7 +42,7 @@
DESTDIR = $$ROOT_BUILD_DIR/bin
-QT += network webkit widgets
+QT += network webkitwidgets widgets
have?(QTPRINTSUPPORT): QT += printsupport
macx:QT += xml
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (131299 => 131300)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-10-15 14:06:06 UTC (rev 131300)
@@ -88,9 +88,9 @@
def _path_to_webcore_library(self):
if self.operating_system() == 'mac':
- return self._build_path('lib/QtWebKit.framework/QtWebKit')
+ return self._build_path('lib/QtWebKitWidgets.framework/QtWebKitWidgets')
else:
- return self._build_path('lib/libQtWebKit.so')
+ return self._build_path('lib/libQtWebKitWidgets.so')
def _modules_to_search_for_symbols(self):
# We search in every library to be reliable in the case of building with CONFIG+=force_static_libs_as_shared.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (131299 => 131300)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -50,7 +50,7 @@
DESTDIR = $${ROOT_BUILD_DIR}/lib
-QT += widgets webkit
+QT += widgets webkitwidgets
WEBKIT += wtf _javascript_core webcore
Modified: trunk/Tools/WebKitTestRunner/Target.pri (131299 => 131300)
--- trunk/Tools/WebKitTestRunner/Target.pri 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2012-10-15 14:06:06 UTC (rev 131300)
@@ -31,7 +31,7 @@
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT = core gui gui-private widgets network testlib quick quick-private webkit
+QT = core gui gui-private widgets network testlib quick quick-private webkitwidgets
WEBKIT += wtf _javascript_core webkit2
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (131299 => 131300)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-15 14:06:06 UTC (rev 131300)
@@ -180,7 +180,7 @@
# For anyone trying to include stdint.h
win32-msvc*|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
-contains(QT, webkit) {
+contains(QT, webkitwidgets) {
# In addition to the main shared QtWebKit library we also
# need to link to any intermediate shared libraries.
force_static_libs_as_shared {
@@ -201,12 +201,12 @@
contains(libraries, $$TARGET): return(true)
# Or anything that uses QtWebKit in this special config
- contains(QT, webkit): return(true)
+ contains(QT, webkitwidgets): return(true)
}
# Lastly, we allow apps (jsc) to link directly to the intermediate
# libraries intead of using the exported symbols from QtWebKit.
- contains(TEMPLATE, app):!contains(QT, webkit): return(true)
+ contains(TEMPLATE, app):!contains(QT, webkitwidgets): return(true)
# Anything else should just get include paths, etc, not link
return(false)
Modified: trunk/Tools/qmake/mkspecs/features/webkit_modules.prf (131299 => 131300)
--- trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/qmake/mkspecs/features/webkit_modules.prf 2012-10-15 14:06:06 UTC (rev 131300)
@@ -34,7 +34,7 @@
# Anything not linking dynamically to QtWebKit should make sure to have its export
# macros synchronized with the code that it will be linked with statically.
- !contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library
+ !contains(QT, webkitwidgets): DEFINES += STATICALLY_LINKED_WITH_$$library
}
!isEmpty(MODULE): CONFIG += creating_module
Modified: trunk/Tools/qmake/mkspecs/features/win32/default_post.prf (131299 => 131300)
--- trunk/Tools/qmake/mkspecs/features/win32/default_post.prf 2012-10-15 13:51:55 UTC (rev 131299)
+++ trunk/Tools/qmake/mkspecs/features/win32/default_post.prf 2012-10-15 14:06:06 UTC (rev 131300)
@@ -40,4 +40,4 @@
}
# To ensure the Qt export macros are set to dllexport
-contains(TEMPLATE, lib):!contains(QT, webkit): DEFINES += QT_MAKEDLL
+contains(TEMPLATE, lib):!contains(QT, webkitwidgets): DEFINES += QT_MAKEDLL
