[webkit-changes] [134066] trunk/Tools
Title: [134066] trunk/Tools
Revision 134066
Author ves...@webkit.org
Date 2012-11-09 07:23:49 -0800 (Fri, 09 Nov 2012)
Log Message
[Qt] Stop watchlist from triggering QtBuildSystem rule on DerivedSources
Having DerivedSources.pri in the watchlist regexp was creating too much
noise.
Reviewed by Ossy.
* Scripts/webkitpy/common/config/watchlist:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
Diff
Modified: trunk/Tools/ChangeLog (134065 => 134066)
--- trunk/Tools/ChangeLog 2012-11-09 15:18:04 UTC (rev 134065)
+++ trunk/Tools/ChangeLog 2012-11-09 15:23:49 UTC (rev 134066)
@@ -1,3 +1,14 @@
+2012-11-09 Tor Arne Vestbø
+
+[Qt] Stop watchlist from triggering QtBuildSystem rule on DerivedSources
+
+Having DerivedSources.pri in the watchlist regexp was creating too much
+noise.
+
+Reviewed by Ossy.
+
+* Scripts/webkitpy/common/config/watchlist:
+
2012-11-09 Dominik Röttsches
webkitpy/layouttests integration test fails if high shards/processes environment variables are used
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (134065 => 134066)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2012-11-09 15:18:04 UTC (rev 134065)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2012-11-09 15:23:49 UTC (rev 134066)
@@ -105,8 +105,7 @@
# Project files for each target are intentionally left out, as those
# mostly list source and header files, which would just add noise.
"filename": r"Tools/qmake/"
-r"|WebKit.pro"
-r"|.*DerivedSources\.pri",
+r"|WebKit.pro",
},
"QtWebKit2PublicAPI": {
"filename": r"Source/WebKit2/UIProcess/API/qt/"
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136224] trunk/Tools
Title: [136224] trunk/Tools
Revision 136224
Author ves...@webkit.org
Date 2012-11-30 04:01:39 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Add support for prepare_docs and generate_docs
Follow-up to changes in Qt in how documentation is built.
Reviewed by Simon Hausmann.
* qmake/mkspecs/features/default_post.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (136223 => 136224)
--- trunk/Tools/ChangeLog 2012-11-30 11:26:55 UTC (rev 136223)
+++ trunk/Tools/ChangeLog 2012-11-30 12:01:39 UTC (rev 136224)
@@ -1,3 +1,13 @@
+2012-11-30 Tor Arne Vestbø
+
+[Qt] Add support for prepare_docs and generate_docs
+
+Follow-up to changes in Qt in how documentation is built.
+
+Reviewed by Simon Hausmann.
+
+* qmake/mkspecs/features/default_post.prf:
+
2012-11-30 Zan Dobersek
Finally remove webkitpy.common.system.deprecated_logging
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (136223 => 136224)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-11-30 11:26:55 UTC (rev 136223)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-11-30 12:01:39 UTC (rev 136224)
@@ -247,7 +247,7 @@
# qmake_all and generate all the derived sources, just to
# build documentation.
previous_subdir =
-doc_targets = docs install_docs uninstall_docs
+doc_targets = docs install_docs uninstall_docs prepare_docs generate_docs
for(subdir, SUBDIRS) {
equals(subdir, QtWebKit) {
for(doc_target, doc_targets) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136232] trunk/Source/JavaScriptCore
Title: [136232] trunk/Source/_javascript_Core
Revision 136232
Author ves...@webkit.org
Date 2012-11-30 06:16:26 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Place the LLIntOffsetsExtractor binaries in debug/release subdirs on Mac
Otherwise we'll end up using the same LLIntAssembly.h for both build
configs of _javascript_Core -- one of them which will be for the wrong
config.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (136231 => 136232)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-30 13:56:54 UTC (rev 136231)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-30 14:16:26 UTC (rev 136232)
@@ -1,3 +1,15 @@
+2012-11-30 Tor Arne Vestbø
+
+[Qt] Place the LLIntOffsetsExtractor binaries in debug/release subdirs on Mac
+
+Otherwise we'll end up using the same LLIntAssembly.h for both build
+configs of _javascript_Core -- one of them which will be for the wrong
+config.
+
+Reviewed by Simon Hausmann.
+
+* LLIntOffsetsExtractor.pro:
+
2012-11-30 Julien BRIANCEAU
[sh4] Fix compilation warnings in _javascript_Core JIT for sh4 arch
Modified: trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro (136231 => 136232)
--- trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro 2012-11-30 13:56:54 UTC (rev 136231)
+++ trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro 2012-11-30 14:16:26 UTC (rev 136232)
@@ -8,6 +8,8 @@
TEMPLATE = app
TARGET = LLIntOffsetsExtractor
+macx: DESTDIR = $$activeBuildConfig()
+
debug_and_release {
CONFIG += force_build_all
CONFIG += build_all
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136233] trunk
Title: [136233] trunk
Revision 136233
Author ves...@webkit.org
Date 2012-11-30 06:16:44 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Build as a regular Qt module when production_build is enabled
Instead of always setting CONFIG+=force_independent. This means the
libs, headers, and documentation will end up in qtbase for developer
builds of Qt, instead of always in the QtWebKit build directory.
Reviewed by Simon Hausmann.
* Source/api.pri:
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
Diff
Modified: trunk/ChangeLog (136232 => 136233)
--- trunk/ChangeLog 2012-11-30 14:16:26 UTC (rev 136232)
+++ trunk/ChangeLog 2012-11-30 14:16:44 UTC (rev 136233)
@@ -1,3 +1,15 @@
+2012-11-30 Tor Arne Vestbø
+
+[Qt] Build as a regular Qt module when production_build is enabled
+
+Instead of always setting CONFIG+=force_independent. This means the
+libs, headers, and documentation will end up in qtbase for developer
+builds of Qt, instead of always in the QtWebKit build directory.
+
+Reviewed by Simon Hausmann.
+
+* Source/api.pri:
+
2012-11-29 Rafael Weinstein
[HTMLTemplateElement] Add feature flag
Modified: trunk/Source/api.pri (136232 => 136233)
--- trunk/Source/api.pri 2012-11-30 14:16:26 UTC (rev 136232)
+++ trunk/Source/api.pri 2012-11-30 14:16:44 UTC (rev 136233)
@@ -53,7 +53,7 @@
# For WebKit we don't want that behavior for the libraries, as we want
# them to be self-contained in the WebKit build dir.
#
-CONFIG += force_independent
+!production_build: CONFIG += force_independent
BASE_TARGET = $$TARGET
@@ -63,7 +63,7 @@
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
# Make sure the install_name of the QtWebKit library point to webkit
-macx {
+force_independent:macx {
# We do our own absolute path so that we can trick qmake into
# using the webkit build path instead of the Qt install path.
CONFIG -= absolute_library_soname
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [131716] trunk
Title: [131716] trunk
Revision 131716
Author ves...@webkit.org
Date 2012-10-18 01:38:19 -0700 (Thu, 18 Oct 2012)
Log Message
[Qt] Modularize documentation for QtWebKit
Running 'make docs' would fail unless 'make qmake_all' was ran first,
but qmake_all involved generating all the derived sources, which seems
overly complex just for building documentation.
We solve this by preventing all subdirs except QtWebKit from having a
docs target. This would normally work fine on its own, but since we
use CONFIG += ordered, there's now a missing doc target for the
immediate dependency of the QtWebKit subdir. We solve this by adding
a dummy-target ourselves.
Finally, we clean up the qdocconf file to match the rest of the Qt
documentation modularization efforts.
Reviewed by Simon Hausmann.
Modified Paths
trunk/ChangeLog
trunk/Source/QtWebKit.pro
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/api.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Added Paths
trunk/Source/qtwebkit.qdocconf
Removed Paths
trunk/Source/WebKit/qt/docs/docs.pri
trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf
Diff
Modified: trunk/ChangeLog (131715 => 131716)
--- trunk/ChangeLog 2012-10-18 08:25:48 UTC (rev 131715)
+++ trunk/ChangeLog 2012-10-18 08:38:19 UTC (rev 131716)
@@ -1,3 +1,26 @@
+2012-10-17 Tor Arne Vestbø
+
+[Qt] Modularize documentation for QtWebKit
+
+Running 'make docs' would fail unless 'make qmake_all' was ran first,
+but qmake_all involved generating all the derived sources, which seems
+overly complex just for building documentation.
+
+We solve this by preventing all subdirs except QtWebKit from having a
+docs target. This would normally work fine on its own, but since we
+use CONFIG += ordered, there's now a missing doc target for the
+immediate dependency of the QtWebKit subdir. We solve this by adding
+a dummy-target ourselves.
+
+Finally, we clean up the qdocconf file to match the rest of the Qt
+documentation modularization efforts.
+
+Reviewed by Simon Hausmann.
+
+* Source/QtWebKit.pro:
+* Source/api.pri:
+* Source/qtwebkit.qdocconf: Added.
+
2012-10-17 Grzegorz Czajkowski , Michal Roj
[WK2][EFL] Implementation of spellchecking feature.
Modified: trunk/Source/QtWebKit.pro (131715 => 131716)
--- trunk/Source/QtWebKit.pro 2012-10-18 08:25:48 UTC (rev 131715)
+++ trunk/Source/QtWebKit.pro 2012-10-18 08:38:19 UTC (rev 131716)
@@ -19,8 +19,6 @@
}
}
-include(WebKit/qt/docs/docs.pri)
-
declarative.file = WebKit/qt/declarative/declarative.pro
declarative.makefile = Makefile.declarative
have?(QTQUICK): SUBDIRS += declarative
Modified: trunk/Source/WebKit/qt/ChangeLog (131715 => 131716)
--- trunk/Source/WebKit/qt/ChangeLog 2012-10-18 08:25:48 UTC (rev 131715)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-10-18 08:38:19 UTC (rev 131716)
@@ -1,3 +1,25 @@
+2012-10-17 Tor Arne Vestbø
+
+[Qt] Modularize documentation for QtWebKit
+
+Running 'make docs' would fail unless 'make qmake_all' was ran first,
+but qmake_all involved generating all the derived sources, which seems
+overly complex just for building documentation.
+
+We solve this by preventing all subdirs except QtWebKit from having a
+docs target. This would normally work fine on its own, but since we
+use CONFIG += ordered, there's now a missing doc target for the
+immediate dependency of the QtWebKit subdir. We solve this by adding
+a dummy-target ourselves.
+
+Finally, we clean up the qdocconf file to match the rest of the Qt
+documentation modularization efforts.
+
+Reviewed by Simon Hausmann.
+
+* docs/docs.pri: Removed.
+* docs/qtwebkit.qdocconf: Removed.
+
2012-10-15 Simon Hausmann
[Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
Deleted: trunk/Source/WebKit/qt/docs/docs.pri (131715 => 131716)
--- trunk/Source/WebKit/qt/docs/docs.pri 2012-10-18 08:25:48 UTC (rev 131715)
+++ trunk/Source/WebKit/qt/docs/docs.pri 2012-10-18 08:38:19 UTC (rev 131716)
@@ -1,7 +0,0 @@
-qtPrepareTool(QDOC, qdoc)
-
-QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$${ROOT_BUILD_DIR} $$QDOC
-
-docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf
-
-QMAKE_EXTRA_TARGETS += docs
Deleted: trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf (131715 => 131716)
--- trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf 2012-10-18 08:25:48 UTC (rev 131715)
+++ trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf 2012-10-18 08:38:19 UTC (rev 131716)
@@ -1,193 +0,0 @@
-# Run qdoc from the directory that contains this file.
-
-project = qtwebkit
-description = "Qt WebKit API Documentation"
-
-headerdirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit2/UIProcess/API/qt
-sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs $SRCDIR/Source/_javascript_Core/qt/api $SRCDIR/WebKit2/UIProcess/API/qt
-output
[webkit-changes] [132042] trunk/Tools
Title: [132042] trunk/Tools Revision 132042 Author ves...@webkit.org Date 2012-10-22 01:43:56 -0700 (Mon, 22 Oct 2012) Log Message [Qt] Move OBJECTS_DIR and friends to default_pre.prf The introduction of load(qt_build_config) in .qmake.conf meant that we started loading qtmodule.pri, which in turn set both MOC_DIR, RCC_DIR, and OBJECTS_DIR. We were setting OBJECTS_DIR in default_post under a isEmpty() guard so that project files could override the objects dir. Instead of using the isEmpty() check we move it to defaul_pre, which will override the qtmodule.pri settings, but still allow project files to override it. Reviewed by Ossy. Modified Paths trunk/Tools/ChangeLog trunk/Tools/qmake/mkspecs/features/default_post.prf trunk/Tools/qmake/mkspecs/features/default_pre.prf Diff Modified: trunk/Tools/ChangeLog (132041 => 132042) --- trunk/Tools/ChangeLog 2012-10-22 08:42:08 UTC (rev 132041) +++ trunk/Tools/ChangeLog 2012-10-22 08:43:56 UTC (rev 132042) @@ -1,3 +1,22 @@ +2012-10-22 Tor Arne Vestbø + +[Qt] Move OBJECTS_DIR and friends to default_pre.prf + +The introduction of load(qt_build_config) in .qmake.conf meant +that we started loading qtmodule.pri, which in turn set both +MOC_DIR, RCC_DIR, and OBJECTS_DIR. + +We were setting OBJECTS_DIR in default_post under a isEmpty() guard +so that project files could override the objects dir. Instead of +using the isEmpty() check we move it to defaul_pre, which will +override the qtmodule.pri settings, but still allow project files +to override it. + +Reviewed by Ossy. + +* qmake/mkspecs/features/default_post.prf: +* qmake/mkspecs/features/default_pre.prf: + 2012-10-22 Mikhail Pozdnyakov WebKitTestRunner needs testRunner.queueLoadingScript and testRunner.queueNonLoadingScript Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (132041 => 132042) --- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-22 08:42:08 UTC (rev 132041) +++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-22 08:43:56 UTC (rev 132042) @@ -28,11 +28,6 @@ } } -# Help keep the build tree clean -MOC_DIR = moc -RCC_DIR = rcc -isEmpty(OBJECTS_DIR): OBJECTS_DIR = obj/$$activeBuildConfig() - # General default build tweaks DEFINES += \ BUILDING_QT__=1 Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (132041 => 132042) --- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-22 08:42:08 UTC (rev 132041) +++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-22 08:43:56 UTC (rev 132042) @@ -69,6 +69,11 @@ MAKEFILE_NOOP_COMMAND = @echo -n win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL +# Help keep the build tree clean +MOC_DIR = moc +RCC_DIR = rcc +OBJECTS_DIR = obj/$$activeBuildConfig() + # Set up a default python version scratchbox: PYTHON = python2.6 else: PYTHON = python ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [132046] trunk/Tools
Title: [132046] trunk/Tools
Revision 132046
Author ves...@webkit.org
Date 2012-10-22 01:59:23 -0700 (Mon, 22 Oct 2012)
Log Message
[Qt] Don't build any of the tools in production_build
Reviewed by Simon Hausmann.
* Tools.pro:
* qmake/mkspecs/features/configure.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Tools.pro
trunk/Tools/qmake/mkspecs/features/configure.prf
Diff
Modified: trunk/Tools/ChangeLog (132045 => 132046)
--- trunk/Tools/ChangeLog 2012-10-22 08:52:03 UTC (rev 132045)
+++ trunk/Tools/ChangeLog 2012-10-22 08:59:23 UTC (rev 132046)
@@ -1,5 +1,14 @@
2012-10-22 Tor Arne Vestbø
+[Qt] Don't build any of the tools in production_build
+
+Reviewed by Simon Hausmann.
+
+* Tools.pro:
+* qmake/mkspecs/features/configure.prf:
+
+2012-10-22 Tor Arne Vestbø
+
[Qt] Move OBJECTS_DIR and friends to default_pre.prf
The introduction of load(qt_build_config) in .qmake.conf meant
Modified: trunk/Tools/Tools.pro (132045 => 132046)
--- trunk/Tools/Tools.pro 2012-10-22 08:52:03 UTC (rev 132045)
+++ trunk/Tools/Tools.pro 2012-10-22 08:59:23 UTC (rev 132046)
@@ -8,22 +8,22 @@
CONFIG += ordered
build?(webkit1) {
-SUBDIRS += QtTestBrowser/QtTestBrowser.pro
+build?(testbrowser): SUBDIRS += QtTestBrowser/QtTestBrowser.pro
build?(drt): SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
-SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
+build?(imagediff): SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
}
build?(webkit2) {
# WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
build?(webkit1):build?(wtr):have?(QTQUICK): SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
-have?(QTQUICK): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
+build?(minibrowser) {
+have?(QTQUICK): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
+SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
+}
}
-!win32:enable?(NETSCAPE_PLUGIN_API) {
-SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
-}
+build?(test_npapi): SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
OTHER_FILES = \
Scripts/* \
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (132045 => 132046)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2012-10-22 08:52:03 UTC (rev 132045)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2012-10-22 08:59:23 UTC (rev 132046)
@@ -11,6 +11,14 @@
load(features)
load(configure)
+WEBKIT_TOOLS_CONFIG = \
+build_drt \
+build_wtr \
+build_imagediff \
+build_test_npapi \
+build_testbrowser \
+build_minibrowser
+
defineTest(runConfigure) {
!webkit_configured:!print_defaults {
log($${EOL}Running configure tests...$${EOL}$${EOL})
@@ -41,9 +49,8 @@
WEBKIT_CONFIG += \
build_webkit1 \
build_webkit2 \
-build_drt \
-build_wtr \
-build_tests
+build_tests \
+$$WEBKIT_TOOLS_CONFIG
# Sanatize WebKit1/WebKit2, as WebKit.pro uses these two options
# to determine which pro-files to include. The remaining sanitazion
@@ -86,12 +93,14 @@
WEBKIT_CONFIG -= build_drt build_wtr build_tests
}
+win32|!enable?(NETSCAPE_PLUGIN_API): WEBKIT_CONFIG -= build_test_npapi
+
wince* {
WEBKIT_CONFIG -= build_drt
}
production_build {
-WEBKIT_CONFIG -= build_drt build_wtr build_tests
+WEBKIT_CONFIG -= $$WEBKIT_TOOLS_CONFIG build_tests
}
print_defaults {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128304] trunk/Tools
Title: [128304] trunk/Tools
Revision 128304
Author ves...@webkit.org
Date 2012-09-12 07:10:42 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
By hard-coding the names of the targets we defined we ended up just
redefining the previous target when using addStrictSubdirOrderBetween
more than once in a single project file.
We now embed the two base targets into the target names.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (128303 => 128304)
--- trunk/Tools/ChangeLog 2012-09-12 13:51:02 UTC (rev 128303)
+++ trunk/Tools/ChangeLog 2012-09-12 14:10:42 UTC (rev 128304)
@@ -1,3 +1,17 @@
+2012-09-12 Tor Arne Vestbø
+
+[Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
+
+By hard-coding the names of the targets we defined we ended up just
+redefining the previous target when using addStrictSubdirOrderBetween
+more than once in a single project file.
+
+We now embed the two base targets into the target names.
+
+Reviewed by Simon Hausmann.
+
+* qmake/mkspecs/features/functions.prf:
+
2012-09-12 Philippe Liard
Depend on {base,net} GYP targets rather than {base,net}_java.
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (128303 => 128304)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 13:51:02 UTC (rev 128303)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-12 14:10:42 UTC (rev 128304)
@@ -142,18 +142,18 @@
# with the qmake-run of the -qmake_all target, and we end up with a race
# and potentially half-written makefiles. The custom target depends explicitly
# on -qmake_all, to ensure that we have a makefile, and then calls make.
-derived_make_for_qmake.target = $${first_base_target}-make_for_qmake
-derived_make_for_qmake.depends = $${first_base_target}-qmake_all
-derived_make_for_qmake.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile)
-QMAKE_EXTRA_TARGETS += derived_make_for_qmake
+derived_make_for_qmake = $${first_base_target}-make_for_qmake
+eval($${derived_make_for_qmake}.depends = $${first_base_target}-qmake_all)
+eval($${derived_make_for_qmake}.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile))
+QMAKE_EXTRA_TARGETS += $${derived_make_for_qmake}
# This target ensures that running "make qmake_all" will force both qmake and make
# to be run on the derived sources before running qmake on the target, so that
# qmake can pick up the right dependencies for the target based on the derived
# sources that were generated.
-target_make_qmake.target = $${second_base_target}-qmake_all
-target_make_qmake.depends = $${derived_make_for_qmake.target}
-QMAKE_EXTRA_TARGETS += target_make_qmake
+target_make_qmake = $${second_base_target}-qmake_all
+eval($${target_make_qmake}.depends = $${derived_make_for_qmake})
+QMAKE_EXTRA_TARGETS += $${target_make_qmake}
# Make things work even if qmake -r is used.
CONFIG += dont_recurse
@@ -161,13 +161,10 @@
export(SUBDIRS)
export(NO_RECURSIVE_QMAKE_SUBDIRS)
export(CONFIG)
-export(target_make_qmake.target)
-export(target_make_qmake.depends)
-export(derived_make_for_qmake.target)
-export(derived_make_for_qmake.depends)
-export(derived_make_for_qmake.commands)
-export(target_make.target)
-export(target_make.depends)
+export($${target_make_qmake}.target)
+export($${target_make_qmake}.depends)
+export($${derived_make_for_qmake}.depends)
+export($${derived_make_for_qmake}.commands)
export(QMAKE_EXTRA_TARGETS)
return(true)
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128305] trunk/Tools
Title: [128305] trunk/Tools
Revision 128305
Author ves...@webkit.org
Date 2012-09-12 07:11:01 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Update build-jsc after r128174
Reviewed by Ossy.
* Scripts/build-jsc:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-jsc
Diff
Modified: trunk/Tools/ChangeLog (128304 => 128305)
--- trunk/Tools/ChangeLog 2012-09-12 14:10:42 UTC (rev 128304)
+++ trunk/Tools/ChangeLog 2012-09-12 14:11:01 UTC (rev 128305)
@@ -1,5 +1,13 @@
2012-09-12 Tor Arne Vestbø
+[Qt] Update build-jsc after r128174
+
+Reviewed by Ossy.
+
+* Scripts/build-jsc:
+
+2012-09-12 Tor Arne Vestbø
+
[Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
By hard-coding the names of the targets we defined we ended up just
Modified: trunk/Tools/Scripts/build-jsc (128304 => 128305)
--- trunk/Tools/Scripts/build-jsc 2012-09-12 14:10:42 UTC (rev 128304)
+++ trunk/Tools/Scripts/build-jsc 2012-09-12 14:11:01 UTC (rev 128305)
@@ -66,7 +66,7 @@
my @projects = ("WTF", "_javascript_Core");
# Pick up the --no-webkit2 option from BUILD_WEBKIT_ARGS if it is needed
push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'});
-push @ARGV, "--qmakearg=CONFIG+=no_webkit2" if checkForArgumentAndRemoveFromARGV("--no-webkit2");
+push @ARGV, "WEBKIT_CONFIG-=build_webkit2" if checkForArgumentAndRemoveFromARGV("--no-webkit2");
my $result = buildQMakeProjects(\@projects, 0, @ARGV);
exit exitStatus($result);
} elsif (cmakeBasedPortName()) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128438] trunk/Source/WebKit2
Title: [128438] trunk/Source/WebKit2
Revision 128438
Author ves...@webkit.org
Date 2012-09-13 03:33:36 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Fix build against namespaced Qt
Patch by Oswald Buddenhagen on 2012-09-13
Reviewed by Tor Arne Vestbø.
* UIProcess/qt/PageViewportControllerClientQt.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128437 => 128438)
--- trunk/Source/WebKit2/ChangeLog 2012-09-13 10:29:21 UTC (rev 128437)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-13 10:33:36 UTC (rev 128438)
@@ -1,3 +1,11 @@
+2012-09-13 Oswald Buddenhagen
+
+[Qt] Fix build against namespaced Qt
+
+Reviewed by Tor Arne Vestbø.
+
+* UIProcess/qt/PageViewportControllerClientQt.h:
+
2012-09-13 Michał Pakuła vel Rutka
[EFL][Qt][WK2] Implement shared undo controller for EFL and Qt port.
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h (128437 => 128438)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-13 10:29:21 UTC (rev 128437)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-13 10:33:36 UTC (rev 128438)
@@ -31,11 +31,11 @@
#include
QT_BEGIN_NAMESPACE
-class QQuickWebPage;
-class QQuickWebView;
class QRectF;
QT_END_NAMESPACE
+class QQuickWebPage;
+class QQuickWebView;
class QWebKitTest;
namespace WebKit {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128439] trunk
Title: [128439] trunk
Revision 128439
Author ves...@webkit.org
Date 2012-09-13 03:37:28 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Fllow rename of qt_module_config.prf to qt_module.prf
Patch by Oswald Buddenhagen on 2012-09-13
Reviewed by Tor Arne Vestbø.
* Source/api.pri:
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
Diff
Modified: trunk/ChangeLog (128438 => 128439)
--- trunk/ChangeLog 2012-09-13 10:33:36 UTC (rev 128438)
+++ trunk/ChangeLog 2012-09-13 10:37:28 UTC (rev 128439)
@@ -1,3 +1,11 @@
+2012-09-13 Oswald Buddenhagen
+
+[Qt] Fllow rename of qt_module_config.prf to qt_module.prf
+
+Reviewed by Tor Arne Vestbø.
+
+* Source/api.pri:
+
2012-09-13 Simon Hausmann
[Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
Modified: trunk/Source/api.pri (128438 => 128439)
--- trunk/Source/api.pri 2012-09-13 10:33:36 UTC (rev 128438)
+++ trunk/Source/api.pri 2012-09-13 10:37:28 UTC (rev 128439)
@@ -27,7 +27,7 @@
BASE_TARGET = $$TARGET
-load(qt_module_config)
+load(qt_module)
# Make sure the module config doesn't override our preferred build config.
debug_and_release:if(!debug|!release) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128440] trunk/Source/WebKit/qt
Title: [128440] trunk/Source/WebKit/qt
Revision 128440
Author ves...@webkit.org
Date 2012-09-13 03:39:34 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Fix qdoc executable preparation
Patch by Oswald Buddenhagen on 2012-09-13
Reviewed by Tor Arne Vestbø.
* docs/docs.pri:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/docs/docs.pri
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (128439 => 128440)
--- trunk/Source/WebKit/qt/ChangeLog 2012-09-13 10:37:28 UTC (rev 128439)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-09-13 10:39:34 UTC (rev 128440)
@@ -1,3 +1,11 @@
+2012-09-13 Oswald Buddenhagen
+
+[Qt] Fix qdoc executable preparation
+
+Reviewed by Tor Arne Vestbø.
+
+* docs/docs.pri:
+
2012-09-12 Sheriff Bot
Unreviewed, rolling out r127876.
Modified: trunk/Source/WebKit/qt/docs/docs.pri (128439 => 128440)
--- trunk/Source/WebKit/qt/docs/docs.pri 2012-09-13 10:37:28 UTC (rev 128439)
+++ trunk/Source/WebKit/qt/docs/docs.pri 2012-09-13 10:39:34 UTC (rev 128440)
@@ -1,10 +1,5 @@
-QDOC = $$QT.core.bins/qdoc
+qtPrepareTool(QDOC, qdoc)
-$$unixstyle {
-} else {
-QDOC = $$replace(QDOC, "qdoc", "qdoc3.exe")
-}
-
QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$${ROOT_BUILD_DIR} $$QDOC
docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128450] trunk
Title: [128450] trunk Revision 128450 Author ves...@webkit.org Date 2012-09-13 05:39:46 -0700 (Thu, 13 Sep 2012) Log Message [Qt] Make sure LIBS, PKGCONFIG, and QT, do not affect QtWebKit's prl file Unless it's actually a dependency of the public QtWebKit API. We could replace every occurance of LIBS, PKGCONFIG, and QT, in the pri files with their _PRIVATE equivivalent, but that's likely to break when someone adds a new QT/LIBS/PKGCONFIG += foo line somewhere. Instead we clean up the variables in default_post. This means that the CONFIG -= explicitlib in linkAgainstLibrary() is no longer needed, as it was a workaround for the intermediate libraries ending up in the prl file. And, since CONFIG -= staticlib was there to support the explicitlib option, we can remove that too (as well as the exception for gprof, since it would be empty). If gprof needs tweaks to always link statically they should go in gprof.prf. Reviewed by Simon Hausmann. Modified Paths trunk/ChangeLog trunk/Source/api.pri trunk/Tools/ChangeLog trunk/Tools/qmake/mkspecs/features/default_post.prf trunk/Tools/qmake/mkspecs/features/functions.prf Diff Modified: trunk/ChangeLog (128449 => 128450) --- trunk/ChangeLog 2012-09-13 12:37:51 UTC (rev 128449) +++ trunk/ChangeLog 2012-09-13 12:39:46 UTC (rev 128450) @@ -1,3 +1,25 @@ +2012-09-13 Tor Arne Vestbø + +[Qt] Make sure LIBS, PKGCONFIG, and QT, do not affect QtWebKit's prl file + +Unless it's actually a dependency of the public QtWebKit API. + +We could replace every occurance of LIBS, PKGCONFIG, and QT, in the pri +files with their _PRIVATE equivivalent, but that's likely to break when +someone adds a new QT/LIBS/PKGCONFIG += foo line somewhere. Instead we +clean up the variables in default_post. + +This means that the CONFIG -= explicitlib in linkAgainstLibrary() is no +longer needed, as it was a workaround for the intermediate libraries ending +up in the prl file. And, since CONFIG -= staticlib was there to support +the explicitlib option, we can remove that too (as well as the exception +for gprof, since it would be empty). If gprof needs tweaks to always link +statically they should go in gprof.prf. + +Reviewed by Simon Hausmann. + +* Source/api.pri: + 2012-09-13 Oswald Buddenhagen [Qt] Fllow rename of qt_module_config.prf to qt_module.prf Modified: trunk/Source/api.pri (128449 => 128450) --- trunk/Source/api.pri 2012-09-13 12:37:51 UTC (rev 128449) +++ trunk/Source/api.pri 2012-09-13 12:39:46 UTC (rev 128450) @@ -14,6 +14,11 @@ MODULE = webkit MODULE_PRI = ../Tools/qmake/qt_webkit.pri +# 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. +QT_API_DEPENDS = core gui network +build?(webkit1): QT_API_DEPENDS += widgets + # Custom developer-build handling --- # # The assumption for Qt developer builds is that the module file Modified: trunk/Tools/ChangeLog (128449 => 128450) --- trunk/Tools/ChangeLog 2012-09-13 12:37:51 UTC (rev 128449) +++ trunk/Tools/ChangeLog 2012-09-13 12:39:46 UTC (rev 128450) @@ -1,3 +1,26 @@ +2012-09-13 Tor Arne Vestbø + +[Qt] Make sure LIBS, PKGCONFIG, and QT, do not affect QtWebKit's prl file + +Unless it's actually a dependency of the public QtWebKit API. + +We could replace every occurance of LIBS, PKGCONFIG, and QT, in the pri +files with their _PRIVATE equivivalent, but that's likely to break when +someone adds a new QT/LIBS/PKGCONFIG += foo line somewhere. Instead we +clean up the variables in default_post. + +This means that the CONFIG -= explicitlib in linkAgainstLibrary() is no +longer needed, as it was a workaround for the intermediate libraries ending +up in the prl file. And, since CONFIG -= staticlib was there to support +the explicitlib option, we can remove that too (as well as the exception +for gprof, since it would be empty). If gprof needs tweaks to always link +statically they should go in gprof.prf. + +Reviewed by Simon Hausmann. + +* qmake/mkspecs/features/default_post.prf: +* qmake/mkspecs/features/functions.prf: + 2012-09-13 Mario Sanchez Prada [GTK] "Infinite" loop in AccessibilityUIElementGtk.cpp Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128449 => 128450) --- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 12:37:51 UTC (rev 128449) +++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 12:39:46 UTC (rev 128450) @@ -242,6 +242,19 @@ LIBS = $$existing_libs $$LIBS } +# Sanitize PKGCONFIG and LIBS, as we don't want any of these libraries +# to end up in as public API dependenices in the QtWebKit prl file. +PKGCONFIG_PRIVATE *= $$PKGCONFIG +unset(PKGCONFIG) +LIBS_PRIVATE = $$LIBS +
[webkit-changes] [128455] trunk/Tools
Title: [128455] trunk/Tools Revision 128455 Author ves...@webkit.org Date 2012-09-13 07:21:25 -0700 (Thu, 13 Sep 2012) Log Message [Qt] Don't overwrite LIBS_PRIVATE when sanitizing LIBS Reviewed by Ossy. * qmake/mkspecs/features/default_post.prf: Modified Paths trunk/Tools/ChangeLog trunk/Tools/qmake/mkspecs/features/default_post.prf Diff Modified: trunk/Tools/ChangeLog (128454 => 128455) --- trunk/Tools/ChangeLog 2012-09-13 14:15:14 UTC (rev 128454) +++ trunk/Tools/ChangeLog 2012-09-13 14:21:25 UTC (rev 128455) @@ -1,3 +1,11 @@ +2012-09-13 Tor Arne Vestbø + +[Qt] Don't overwrite LIBS_PRIVATE when sanitizing LIBS + +Reviewed by Ossy. + +* qmake/mkspecs/features/default_post.prf: + 2012-09-13 Kenneth Rohde Christiansen [EFL][DRT] Implement LayoutTestController::layerTreeAsText Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128454 => 128455) --- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 14:15:14 UTC (rev 128454) +++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 14:21:25 UTC (rev 128455) @@ -246,7 +246,7 @@ # to end up in as public API dependenices in the QtWebKit prl file. PKGCONFIG_PRIVATE *= $$PKGCONFIG unset(PKGCONFIG) -LIBS_PRIVATE = $$LIBS +LIBS_PRIVATE += $$LIBS unset(LIBS) # We do have a limited subset of Qt modules as dependencies for using ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128465] trunk
Title: [128465] trunk
Revision 128465
Author ves...@webkit.org
Date 2012-09-13 08:10:43 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Ensure that QT is finalized before loading qt_module.prf
As qt_module.prf does dependency tracking based on the content of the
QT variable. The intermediate WebKit modules modify the variable in
their .pri files, so we have to ensure we've loaded all the modules
before loading qt_module.
Reviewed by Tor Arne Vestbø.
Patch by Oswald Buddenhagen on 2012-09-13
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Added Paths
trunk/Tools/qmake/mkspecs/features/webkit_modules.prf
Diff
Modified: trunk/ChangeLog (128464 => 128465)
--- trunk/ChangeLog 2012-09-13 15:09:29 UTC (rev 128464)
+++ trunk/ChangeLog 2012-09-13 15:10:43 UTC (rev 128465)
@@ -1,5 +1,19 @@
2012-09-13 Tor Arne Vestbø
+[Qt] Ensure that QT is finalized before loading qt_module.prf
+
+As qt_module.prf does dependency tracking based on the content of the
+QT variable. The intermediate WebKit modules modify the variable in
+their .pri files, so we have to ensure we've loaded all the modules
+before loading qt_module.
+
+Reviewed by Tor Arne Vestbø.
+Patch by Oswald Buddenhagen on 2012-09-13
+
+* Source/api.pri:
+
+2012-09-13 Tor Arne Vestbø
+
[Qt] Make sure LIBS, PKGCONFIG, and QT, do not affect QtWebKit's prl file
Unless it's actually a dependency of the public QtWebKit API.
Modified: trunk/Source/api.pri (128464 => 128465)
--- trunk/Source/api.pri 2012-09-13 15:09:29 UTC (rev 128464)
+++ trunk/Source/api.pri 2012-09-13 15:10:43 UTC (rev 128465)
@@ -4,13 +4,30 @@
# See 'Tools/qmake/README' for an overview of the build system
# ---
+# Use Qt5's module system
+load(qt_build_config)
+
TEMPLATE = lib
TARGET = QtWebKit
WEBKIT_DESTDIR = $${ROOT_BUILD_DIR}/lib
-# Use Qt5's module system
-load(qt_build_config)
+WEBKIT += wtf _javascript_core webcore
+
+build?(webkit1): WEBKIT += webkit1
+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.
+build?(webkit1): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit/WebKit1.pro
+build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
+
+use?(3D_GRAPHICS): WEBKIT += angle
+
+# We load the relevant modules here, so that the effects of each module
+# on the QT variable can be picked up when we later load(qt_module).
+load(webkit_modules)
+
MODULE = webkit
MODULE_PRI = ../Tools/qmake/qt_webkit.pri
@@ -73,18 +90,6 @@
}
}
-WEBKIT += wtf _javascript_core webcore
-
-build?(webkit1): WEBKIT += webkit1
-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.
-build?(webkit1): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit/WebKit1.pro
-build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
-
-use?(3D_GRAPHICS): WEBKIT += angle
-
qnx {
# see: https://bugs.webkit.org/show_bug.cgi?id=93460
# the gcc 4.4.2 used in the qnx bbndk cannot cope with
Modified: trunk/Tools/ChangeLog (128464 => 128465)
--- trunk/Tools/ChangeLog 2012-09-13 15:09:29 UTC (rev 128464)
+++ trunk/Tools/ChangeLog 2012-09-13 15:10:43 UTC (rev 128465)
@@ -1,3 +1,18 @@
+2012-09-13 Tor Arne Vestbø
+
+[Qt] Ensure that QT is finalized before loading qt_module.prf
+
+As qt_module.prf does dependency tracking based on the content of the
+QT variable. The intermediate WebKit modules modify the variable in
+their .pri files, so we have to ensure we've loaded all the modules
+before loading qt_module.
+
+Reviewed by Tor Arne Vestbø.
+Patch by Oswald Buddenhagen on 2012-09-13
+
+* qmake/mkspecs/features/default_post.prf:
+* qmake/mkspecs/features/webkit_modules.prf: Added.
+
2012-09-13 Simon Hausmann
[Qt] Fix build of Qt WTR/MiniBrowser with MSVC and nmake
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128464 => 128465)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 15:09:29 UTC (rev 128464)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-13 15:10:43 UTC (rev 128465)
@@ -183,16 +183,6 @@
}
}
-# Reorder libraries so that the link and include order is correct,
-# and make sure the case matches the original case.
-libraries = WebKit1 WebKit2 WebCore ANGLE _javascript_Core WTF
-for(library, libraries) {
-contains(WEBKIT, $$lower($$library)) {
-WEBKIT -= $$lower($$library)
-WEBKIT *= $$library
-}
-}
-
defineTest(needToLink) {
# The main dynamic library always needs to link in the intermediate libraries
c
[webkit-changes] [128606] trunk
Title: [128606] trunk
Revision 128606
Author ves...@webkit.org
Date 2012-09-14 06:41:24 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Fix handling of debug/release/debug_and_release/build_all
We now pick up the defaults from Qt, in default_pre (CONFIG already
contains the appropriate values for debug and release). We then let
the command line arguments to qmake, or the project files themselves,
override the configuration, and finally we sanitize the configuration
in default_post.
Reviewed by Simon Hausmann.
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/default_pre.prf
trunk/Tools/qmake/mkspecs/features/mac/default_pre.prf
Diff
Modified: trunk/ChangeLog (128605 => 128606)
--- trunk/ChangeLog 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/ChangeLog 2012-09-14 13:41:24 UTC (rev 128606)
@@ -1,3 +1,17 @@
+2012-09-14 Tor Arne Vestbø
+
+[Qt] Fix handling of debug/release/debug_and_release/build_all
+
+We now pick up the defaults from Qt, in default_pre (CONFIG already
+contains the appropriate values for debug and release). We then let
+the command line arguments to qmake, or the project files themselves,
+override the configuration, and finally we sanitize the configuration
+in default_post.
+
+Reviewed by Simon Hausmann.
+
+* Source/api.pri:
+
2012-09-14 Keishi Hattori
Add runtime flag that enables lang attribute for form controls in LayoutTests
Modified: trunk/Source/api.pri (128605 => 128606)
--- trunk/Source/api.pri 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/Source/api.pri 2012-09-14 13:41:24 UTC (rev 128606)
@@ -51,14 +51,6 @@
load(qt_module)
-# Make sure the module config doesn't override our preferred build config.
-debug_and_release:if(!debug|!release) {
-# Removing debug_and_release causes issues with lib suffixes when building debug on Windows.
-# Work around it by only removing build_all, and still create the Makefiles for both configurations.
-win32*: CONFIG -= build_all
-else: CONFIG -= debug_and_release
-}
-
# Allow doing a debug-only build of WebKit (not supported by Qt)
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
Modified: trunk/Tools/ChangeLog (128605 => 128606)
--- trunk/Tools/ChangeLog 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/Tools/ChangeLog 2012-09-14 13:41:24 UTC (rev 128606)
@@ -1,3 +1,22 @@
+2012-09-14 Tor Arne Vestbø
+
+[Qt] Fix handling of debug/release/debug_and_release/build_all
+
+We now pick up the defaults from Qt, in default_pre (CONFIG already
+contains the appropriate values for debug and release). We then let
+the command line arguments to qmake, or the project files themselves,
+override the configuration, and finally we sanitize the configuration
+in default_post.
+
+Reviewed by Simon Hausmann.
+
+* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+* Scripts/webkitdirs.pm:
+(buildQMakeProjects):
+* qmake/mkspecs/features/default_post.prf:
+* qmake/mkspecs/features/default_pre.prf:
+* qmake/mkspecs/features/mac/default_pre.prf:
+
2012-09-14 Sudarsana Nagineni
WebKitTestRunner needs layoutTestController.setTabKeyCyclesThroughElements
Modified: trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro (128605 => 128606)
--- trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-09-14 13:41:24 UTC (rev 128606)
@@ -50,8 +50,6 @@
QMAKE_PLUGIN_BUNDLE_NAME = $$TARGET
QMAKE_BUNDLE_LOCATION += "Contents/MacOS"
-!build_pass:CONFIG += build_all
-
OBJECTIVE_SOURCES += PluginObjectMac.mm
LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (128605 => 128606)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-09-14 13:41:24 UTC (rev 128606)
@@ -2267,7 +2267,6 @@
} elsif ($passedConfig) {
die "Build type $passedConfig is not supported with --qt.\n";
}
-push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
# Using build-webkit to build assumes you want a developer-build
push @buildArgs, "CONFIG-=production_build";
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128605 => 128606)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 13:37:23 UTC (rev 128605)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 13:41:24 UTC (rev 128606)
@@ -12,6 +12,19 @@
root_project_file: finalizeConfigure()
[webkit-changes] [128608] trunk/Source/WebKit2
Title: [128608] trunk/Source/WebKit2 Revision 128608 Author ves...@webkit.org Date 2012-09-14 07:02:35 -0700 (Fri, 14 Sep 2012) Log Message [Qt] Move .mm file to OBJECTIVE_SOURCES Reviewed by Simon Hausmann. * Target.pri: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Target.pri Diff Modified: trunk/Source/WebKit2/ChangeLog (128607 => 128608) --- trunk/Source/WebKit2/ChangeLog 2012-09-14 14:01:17 UTC (rev 128607) +++ trunk/Source/WebKit2/ChangeLog 2012-09-14 14:02:35 UTC (rev 128608) @@ -1,3 +1,11 @@ +2012-09-14 Tor Arne Vestbø + +[Qt] Move .mm file to OBJECTIVE_SOURCES + +Reviewed by Simon Hausmann. + +* Target.pri: + 2012-09-14 Sudarsana Nagineni WebKitTestRunner needs layoutTestController.setTabKeyCyclesThroughElements Modified: trunk/Source/WebKit2/Target.pri (128607 => 128608) --- trunk/Source/WebKit2/Target.pri 2012-09-14 14:01:17 UTC (rev 128607) +++ trunk/Source/WebKit2/Target.pri 2012-09-14 14:02:35 UTC (rev 128608) @@ -842,7 +842,7 @@ $$PWD/../../WebKitLibraries/ HEADERS += \ WebProcess/WebCoreSupport/qt/WebSystemInterface.h -SOURCES += \ +OBJECTIVE_SOURCES += \ WebProcess/WebCoreSupport/qt/WebSystemInterface.mm } INCLUDEPATH += \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128616] trunk
Title: [128616] trunk
Revision 128616
Author ves...@webkit.org
Date 2012-09-14 08:58:28 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Make force_static_libs_as_shared work on Mac OS
We had to move a few LIBS += around that were in the wrong place,
and not caught when everything was just linked into the final
QtWebKit library.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jsc.pro
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.pri
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit1.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/force_static_libs_as_shared.prf
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (128615 => 128616)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø
+
+[Qt] Make force_static_libs_as_shared work on Mac OS
+
+We had to move a few LIBS += around that were in the wrong place,
+and not caught when everything was just linked into the final
+QtWebKit library.
+
+Reviewed by Simon Hausmann.
+
+* jsc.pro: No need for AppKit, we get it from WTF.pri
+
2012-09-14 Kevin Funk
Fix interpreter build
Modified: trunk/Source/_javascript_Core/jsc.pro (128615 => 128616)
--- trunk/Source/_javascript_Core/jsc.pro 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/_javascript_Core/jsc.pro 2012-09-14 15:58:28 UTC (rev 128616)
@@ -19,10 +19,6 @@
SOURCES = jsc.cpp
-mac {
-LIBS_PRIVATE += -framework AppKit
-}
-
win32-* {
LIBS += -ladvapi32
}
Modified: trunk/Source/WTF/ChangeLog (128615 => 128616)
--- trunk/Source/WTF/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WTF/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø
+
+[Qt] Make force_static_libs_as_shared work on Mac OS
+
+We had to move a few LIBS += around that were in the wrong place,
+and not caught when everything was just linked into the final
+QtWebKit library.
+
+Reviewed by Simon Hausmann.
+
+* WTF.pri:
+
2012-09-14 Ilya Tikhonovsky
Web Inspector: NMI: convert template versions of String*::reportMemoryUsage functions to normal functions.
Modified: trunk/Source/WTF/WTF.pri (128615 => 128616)
--- trunk/Source/WTF/WTF.pri 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WTF/WTF.pri 2012-09-14 15:58:28 UTC (rev 128616)
@@ -36,3 +36,7 @@
# required for timegm
LIBS += -lnbutil
}
+
+mac {
+LIBS += -framework AppKit
+}
Modified: trunk/Source/WebCore/ChangeLog (128615 => 128616)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø
+
+[Qt] Make force_static_libs_as_shared work on Mac OS
+
+We had to move a few LIBS += around that were in the wrong place,
+and not caught when everything was just linked into the final
+QtWebKit library.
+
+Reviewed by Simon Hausmann.
+
+* WebCore.pri:
+
2012-09-14 Rick Byers
Gesture events sent to wrong node when page is scrolled
Modified: trunk/Source/WebCore/WebCore.pri (128615 => 128616)
--- trunk/Source/WebCore/WebCore.pri 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebCore/WebCore.pri 2012-09-14 15:58:28 UTC (rev 128616)
@@ -176,8 +176,21 @@
LIBS += -framework AppKit -framework AudioUnit \
-framework AudioToolbox -framework CoreAudio \
--framework QuartzCore -framework QTKit
+-framework QuartzCore -framework QTKit \
+-framework Security -framework IOKit
+# We can know the Mac OS version by using the Darwin major version
+DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
+DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
+equals(DARWIN_MAJOR_VERSION, "12") {
+LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+} else:equals(DARWIN_MAJOR_VERSION, "11") {
+LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+} else:equals(DARWIN_MAJOR_VERSION, "10") {
+LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+} else:equals(DARWIN_MAJOR_VERSION, "9") {
+LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+}
} else:use?(GSTREAMER) {
INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
PKGCONFIG += gstreamer-video-0.10
@@ -217,7 +230,7 @@
use?(webp): LIBS += -lwebp
mac {
-LIBS += -fram
[webkit-changes] [128617] trunk/Tools
Title: [128617] trunk/Tools
Revision 128617
Author ves...@webkit.org
Date 2012-09-14 08:58:50 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Enable force_static_libs_as_shared for development
Not enabled for buildbots or production-builds (part of Qt5)
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (128616 => 128617)
--- trunk/Tools/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
+++ trunk/Tools/ChangeLog 2012-09-14 15:58:50 UTC (rev 128617)
@@ -1,5 +1,15 @@
2012-09-14 Tor Arne Vestbø
+[Qt] Enable force_static_libs_as_shared for development
+
+Not enabled for buildbots or production-builds (part of Qt5)
+
+Reviewed by Simon Hausmann.
+
+* qmake/mkspecs/features/default_post.prf:
+
+2012-09-14 Tor Arne Vestbø
+
[Qt] Make force_static_libs_as_shared work on Mac OS
We had to move a few LIBS += around that were in the wrong place,
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128616 => 128617)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:58:28 UTC (rev 128616)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:58:50 UTC (rev 128617)
@@ -71,6 +71,9 @@
contains(_javascript_CORE_JIT, no): DEFINES+=ENABLE_JIT=0
}
+# Enable dynamic instead of static libraries for development
+!production_build:!buildbot:!win*: CONFIG += force_static_libs_as_shared
+
# Template configurations
contains(TEMPLATE, derived) {
# A (mostly) no-op template
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128618] trunk
Title: [128618] trunk
Revision 128618
Author ves...@webkit.org
Date 2012-09-14 09:21:53 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Remove old cruft from the qmake build system
Rubber-stamped by Simon Hausmann.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/DerivedSources.pri
trunk/Source/WebCore/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
trunk/Tools/qmake/mkspecs/features/default_post.prf
Diff
Modified: trunk/Source/WebCore/ChangeLog (128617 => 128618)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 16:21:53 UTC (rev 128618)
@@ -1,5 +1,14 @@
2012-09-14 Tor Arne Vestbø
+[Qt] Remove old cruft from the qmake build system
+
+Rubber-stamped by Simon Hausmann.
+
+* DerivedSources.pri:
+* Target.pri:
+
+2012-09-14 Tor Arne Vestbø
+
[Qt] Make force_static_libs_as_shared work on Mac OS
We had to move a few LIBS += around that were in the wrong place,
Modified: trunk/Source/WebCore/DerivedSources.pri (128617 => 128618)
--- trunk/Source/WebCore/DerivedSources.pri 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-09-14 16:21:53 UTC (rev 128618)
@@ -63,10 +63,6 @@
INJECTED_SCRIPT_WEBGL_MODULE_SOURCE = $$PWD/inspector/InjectedScriptWebGLModuleSource.js
-DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
-
-ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE = $$PWD/bindings/v8/custom/V8ArrayBufferViewCustomScript.js
-
XPATHBISON = $$PWD/xml/XPathGrammar.y
enable?(SVG) {
@@ -805,19 +801,6 @@
InjectedScriptWebGLModuleSource.add_output_to_sources = false
GENERATORS += InjectedScriptWebGLModuleSource
-# GENERATOR 2-c: inspector debugger script source compiler
-debuggerScriptSource.output = DebuggerScriptSource.h
-debuggerScriptSource.input = DEBUGGER_SCRIPT_SOURCE
-debuggerScriptSource.commands = perl $$PWD/inspector/xxd.pl DebuggerScriptSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-debuggerScriptSource.add_output_to_sources = false
-GENERATORS += debuggerScriptSource
-
-arrayBufferViewCustomScript.output = V8ArrayBufferViewCustomScript.h
-arrayBufferViewCustomScript.input = ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE
-arrayBufferViewCustomScript.commands = perl $$PWD/inspector/xxd.pl V8ArrayBufferViewCustomScript_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-arrayBufferViewCustomScript.add_output_to_sources = false
-GENERATORS += arrayBufferViewCustomScript
-
# GENERATOR 4: CSS grammar
cssbison.output = ${QMAKE_FILE_BASE}.cpp
cssbison.input = CSSBISON
Modified: trunk/Source/WebCore/Target.pri (128617 => 128618)
--- trunk/Source/WebCore/Target.pri 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/Target.pri 2012-09-14 16:21:53 UTC (rev 128618)
@@ -14,8 +14,6 @@
CONFIG += staticlib
-DEFINES += QT_MAKEDLL
-
RESOURCES += \
$$PWD/WebCore.qrc
Modified: trunk/Tools/ChangeLog (128617 => 128618)
--- trunk/Tools/ChangeLog 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/ChangeLog 2012-09-14 16:21:53 UTC (rev 128618)
@@ -1,5 +1,14 @@
2012-09-14 Tor Arne Vestbø
+[Qt] Remove old cruft from the qmake build system
+
+Rubber-stamped by Simon Hausmann.
+
+* DumpRenderTree/qt/DumpRenderTree.pro:
+* qmake/mkspecs/features/default_post.prf:
+
+2012-09-14 Tor Arne Vestbø
+
[Qt] Enable force_static_libs_as_shared for development
Not enabled for buildbots or production-builds (part of Qt5)
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (128617 => 128618)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-09-14 16:21:53 UTC (rev 128618)
@@ -9,8 +9,7 @@
TARGET = DumpRenderTree
DESTDIR = $$ROOT_BUILD_DIR/bin
-WEBKIT += wtf webcore
-!v8: WEBKIT += _javascript_core
+WEBKIT += wtf _javascript_core webcore
INCLUDEPATH += \
$$PWD/ \
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128617 => 128618)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 16:21:53 UTC (rev 128618)
@@ -65,12 +65,6 @@
-Winit-self \
$$QMAKE_CXXFLAGS
-v8: DEFINES += WTF_USE_V8=1
-else {
-contains(_javascript_CORE_JIT, yes): DEFINES+=ENABLE_JIT=1
-contains(_javascript_CORE_JIT, no): DEFINES+=ENABLE_JIT=0
-}
-
# Enable dynamic instead of static libraries for development
!production_build:!buildbot:!win*: CONFIG += force_static_libs_as_shared
@@ -190,8 +184,7 @@
# In addition to the main shared QtWebKit library we also
# need to link to any intermediate shared libraries.
force_static_libs_as_shared {
-WEBKIT += wtf webcore
-!v8: WEBKIT += _javascript_core
+WEBKIT += wtf _javascript_core webcore
build?(webkit1): WEBKIT += webkit1
[webkit-changes] [128619] trunk/Tools
Title: [128619] trunk/Tools
Revision 128619
Author ves...@webkit.org
Date 2012-09-14 09:27:59 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Set force_static_libs_as_shared early enough to be caught by configure
Rubber-stamped by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (128618 => 128619)
--- trunk/Tools/ChangeLog 2012-09-14 16:21:53 UTC (rev 128618)
+++ trunk/Tools/ChangeLog 2012-09-14 16:27:59 UTC (rev 128619)
@@ -1,5 +1,13 @@
2012-09-14 Tor Arne Vestbø
+[Qt] Set force_static_libs_as_shared early enough to be caught by configure
+
+Rubber-stamped by Simon Hausmann.
+
+* qmake/mkspecs/features/default_post.prf:
+
+2012-09-14 Tor Arne Vestbø
+
[Qt] Remove old cruft from the qmake build system
Rubber-stamped by Simon Hausmann.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128618 => 128619)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 16:21:53 UTC (rev 128618)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 16:27:59 UTC (rev 128619)
@@ -10,6 +10,9 @@
# or include() and a CONFIG += feature.
CONFIG += config_step
+# Enable dynamic instead of static libraries for development
+!production_build:!buildbot:!win*: CONFIG += force_static_libs_as_shared
+
root_project_file: finalizeConfigure()
# Sanitize build config for single-configuration builds
@@ -65,9 +68,6 @@
-Winit-self \
$$QMAKE_CXXFLAGS
-# Enable dynamic instead of static libraries for development
-!production_build:!buildbot:!win*: CONFIG += force_static_libs_as_shared
-
# Template configurations
contains(TEMPLATE, derived) {
# A (mostly) no-op template
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128735] trunk/Source/WebKit2
Title: [128735] trunk/Source/WebKit2
Revision 128735
Author ves...@webkit.org
Date 2012-09-17 02:55:29 -0700 (Mon, 17 Sep 2012)
Log Message
[Qt] Remove 'using namespace WebCore' from header file
Broke the build on Mac OS X by causing clashes between Fixed from
/usr/include/MacTypes.h and Source/WebCore/platform/Length.h.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/PageViewportController.h
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128734 => 128735)
--- trunk/Source/WebKit2/ChangeLog 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-17 09:55:29 UTC (rev 128735)
@@ -1,3 +1,21 @@
+2012-09-17 Tor Arne Vestbø
+
+[Qt] Remove 'using namespace WebCore' from header file
+
+Broke the build on Mac OS X by causing clashes between Fixed from
+/usr/include/MacTypes.h and Source/WebCore/platform/Length.h.
+
+Reviewed by Simon Hausmann..
+
+* UIProcess/PageViewportController.cpp:
+* UIProcess/PageViewportController.h:
+(PageViewportController):
+(WebKit::PageViewportController::contentsLayoutSize):
+(WebKit):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+* UIProcess/qt/PageViewportControllerClientQt.h:
+(PageViewportControllerClientQt):
+
2012-09-15 Vivek Galatage
WinCairo build fix due to missing symbols for setImagesEnabled and setStorageBlockingPolicy
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-09-17 09:55:29 UTC (rev 128735)
@@ -28,6 +28,8 @@
#include
#include
+using namespace WebCore;
+
namespace WebKit {
static inline float bound(float min, float value, float max)
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-17 09:55:29 UTC (rev 128735)
@@ -32,8 +32,6 @@
class IntSize;
}
-using namespace WebCore;
-
namespace WebKit {
class WebPageProxy;
@@ -76,11 +74,11 @@
void suspendContent();
void resumeContent();
-FloatRect positionRangeForContentAtScale(float viewportScale) const;
+WebCore::FloatRect positionRangeForContentAtScale(float viewportScale) const;
float convertFromViewport(float value) const { return value / m_devicePixelRatio; }
float convertToViewport(float value) const { return value * m_devicePixelRatio; }
-FloatRect convertToViewport(const FloatRect&) const;
+WebCore::FloatRect convertToViewport(const WebCore::FloatRect&) const;
float innerBoundedContentsScale(float) const;
float outerBoundedContentsScale(float) const;
@@ -89,7 +87,7 @@
bool hadUserInteraction() const { return m_hadUserInteraction; }
bool allowsUserScaling() const { return m_allowsUserScaling; }
-FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
+WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
float devicePixelRatio() const { return m_devicePixelRatio; }
float minimumContentsScale() const { return m_minimumScale; }
float maximumContentsScale() const { return m_maximumScale; }
@@ -98,21 +96,21 @@
void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }
// Notifications to the WebProcess.
-void setViewportSize(const FloatSize& newSize);
-void setVisibleContentsRect(const FloatRect& visibleContentsRect, float viewportScale, const FloatPoint& trajectoryVector = FloatPoint::zero());
+void setViewportSize(const WebCore::FloatSize& newSize);
+void setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, float viewportScale, const WebCore::FloatPoint& trajectoryVector = WebCore::FloatPoint::zero());
// Notifications from the WebProcess.
-void didChangeContentsSize(const IntSize& newSize);
-void didChangeViewportAttributes(const ViewportAttributes&);
-void pageDidRequestScroll(const IntPoint& cssPosition);
+void didChangeContentsSize(const WebCore::IntSize& newSize);
+void didChangeViewportAttributes(const WebCore::ViewportAttributes&);
+void pageDidRequestScroll(const WebCore::IntPoint& cssPosition);
private:
-void syncVisibleContents(const FloatPoint &trajectoryVector = FloatPoint::zero());
+void syncVisibleContents(const WebCore::FloatPoint &trajectoryVector = WebCore::FloatPoint::zero());
WebPageProxy* const m_webPageProxy;
[webkit-changes] [128751] trunk
Title: [128751] trunk
Revision 128751
Author ves...@webkit.org
Date 2012-09-17 06:32:37 -0700 (Mon, 17 Sep 2012)
Log Message
[Qt] Auto-generate the module pri file for QtWebKit
Reviewed by Simon Hausmann.
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
trunk/Tools/ChangeLog
Removed Paths
trunk/Tools/qmake/qt_webkit.pri
Diff
Modified: trunk/ChangeLog (128750 => 128751)
--- trunk/ChangeLog 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/ChangeLog 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,3 +1,11 @@
+2012-09-17 Tor Arne Vestbø
+
+[Qt] Auto-generate the module pri file for QtWebKit
+
+Reviewed by Simon Hausmann.
+
+* Source/api.pri:
+
2012-09-14 Julien Chaffraix
Revert r127457 and following fixes due to several hit-testing regressions
Modified: trunk/Source/api.pri (128750 => 128751)
--- trunk/Source/api.pri 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Source/api.pri 2012-09-17 13:32:37 UTC (rev 128751)
@@ -29,7 +29,6 @@
load(webkit_modules)
MODULE = webkit
-MODULE_PRI = ../Tools/qmake/qt_webkit.pri
# 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/Tools/ChangeLog (128750 => 128751)
--- trunk/Tools/ChangeLog 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Tools/ChangeLog 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,3 +1,11 @@
+2012-09-17 Tor Arne Vestbø
+
+[Qt] Auto-generate the module pri file for QtWebKit
+
+Reviewed by Simon Hausmann.
+
+* qmake/qt_webkit.pri: Removed.
+
2012-09-14 Dirk Pranke
nrwt: --additional-platform-dir is broken on chromium ports
Deleted: trunk/Tools/qmake/qt_webkit.pri (128750 => 128751)
--- trunk/Tools/qmake/qt_webkit.pri 2012-09-17 13:31:22 UTC (rev 128750)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-09-17 13:32:37 UTC (rev 128751)
@@ -1,28 +0,0 @@
-# These variables define the library version, which is based on the original
-# Qt library version. It is not related to the release-version of QtWebKit.
-QT.webkit.MAJOR_VERSION = 5
-QT.webkit.MINOR_VERSION = 0
-QT.webkit.PATCH_VERSION = 0
-QT.webkit.VERSION = 5.0.0
-
-QT.webkit.name = QtWebKit
-QT.webkit.bins = $$QT_MODULE_BIN_BASE
-QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
-QT.webkit.imports = $$QT_MODULE_IMPORT_BASE
-QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION/$$QT.webkit.name
-QT.webkit.sources = $$QT_MODULE_BASE
-QT.webkit.libs = $$QT_MODULE_LIB_BASE
-QT.webkit.depends = core gui opengl network
-
-!contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
-QT_CONFIG += webkit
-} else {
-warning("Attempted to include $$QT.webkit.name in the build, but it was not enabled in configure.")
-}
-
-# This is the old syntax for the WebKit version defines.
-# We keep them around in case someone was using them.
-QT_WEBKIT_VERSION = $$QT.webkit.VERSION
-QT_WEBKIT_MAJOR_VERSION = $$QT.webkit.MAJOR_VERSION
-QT_WEBKIT_MINOR_VERSION = $$QT.webkit.MINOR_VERSION
-QT_WEBKIT_PATCH_VERSION = $$QT.webkit.PATCH_VERSION
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128868] trunk
Title: [128868] trunk Revision 128868 Author ves...@webkit.org Date 2012-09-18 03:23:13 -0700 (Tue, 18 Sep 2012) Log Message [Qt] Fix build without the QtQuick module Reviewed by Simon Hausmann. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Target.pri trunk/Tools/ChangeLog trunk/Tools/qmake/mkspecs/features/features.prf Diff Modified: trunk/Source/WebKit2/ChangeLog (128867 => 128868) --- trunk/Source/WebKit2/ChangeLog 2012-09-18 09:42:38 UTC (rev 128867) +++ trunk/Source/WebKit2/ChangeLog 2012-09-18 10:23:13 UTC (rev 128868) @@ -1,3 +1,11 @@ +2012-09-18 Tor Arne Vestbø + +[Qt] Fix build without the QtQuick module + +Reviewed by Simon Hausmann. + +* Target.pri: + 2012-09-17 Eunmi Lee [EFL][WK2] Add NativeWebTouchEvent and handle the Touch event. Modified: trunk/Source/WebKit2/Target.pri (128867 => 128868) --- trunk/Source/WebKit2/Target.pri 2012-09-18 09:42:38 UTC (rev 128867) +++ trunk/Source/WebKit2/Target.pri 2012-09-18 10:23:13 UTC (rev 128868) @@ -617,7 +617,6 @@ UIProcess/WebUIClient.cpp \ UIProcess/WebVibrationProvider.cpp \ UIProcess/WebVibrationProxy.cpp \ -UIProcess/qt/QtWebContext.cpp \ UIProcess/qt/TextCheckerQt.cpp \ UIProcess/qt/WebContextQt.cpp \ UIProcess/qt/WebFullScreenManagerProxyQt.cpp \ @@ -809,7 +808,6 @@ UIProcess/API/qt/qwebpreferences.cpp \ UIProcess/API/qt/qwebkittest.cpp \ UIProcess/qt/PageViewportControllerClientQt.cpp \ -UIProcess/qt/QtWebError.cpp \ UIProcess/qt/QtDialogRunner.cpp \ UIProcess/qt/QtDownloadManager.cpp \ UIProcess/qt/QtPageClient.cpp \ @@ -821,6 +819,8 @@ UIProcess/qt/QtPanGestureRecognizer.cpp \ UIProcess/qt/QtPinchGestureRecognizer.cpp \ UIProcess/qt/QtTapGestureRecognizer.cpp \ +UIProcess/qt/QtWebContext.cpp \ +UIProcess/qt/QtWebError.cpp \ UIProcess/qt/WebContextMenuProxyQt.cpp \ UIProcess/qt/WebGeolocationProviderQt.cpp \ UIProcess/qt/WebPopupMenuProxyQt.cpp \ Modified: trunk/Tools/ChangeLog (128867 => 128868) --- trunk/Tools/ChangeLog 2012-09-18 09:42:38 UTC (rev 128867) +++ trunk/Tools/ChangeLog 2012-09-18 10:23:13 UTC (rev 128868) @@ -1,3 +1,11 @@ +2012-09-18 Tor Arne Vestbø + +[Qt] Fix build without the QtQuick module + +Reviewed by Simon Hausmann. + +* qmake/mkspecs/features/features.prf: + 2012-09-18 Stephanie Lewis Build fix after http://trac.webkit.org/projects/webkit/changeset/128852. Modified: trunk/Tools/qmake/mkspecs/features/features.prf (128867 => 128868) --- trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-18 09:42:38 UTC (rev 128867) +++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-18 10:23:13 UTC (rev 128868) @@ -34,6 +34,8 @@ # haveQtModule(quick): WEBKIT_CONFIG += have_qtquick +else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built" + haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [127583] trunk/Tools
Title: [127583] trunk/Tools
Revision 127583
Author ves...@webkit.org
Date 2012-09-05 06:11:35 -0700 (Wed, 05 Sep 2012)
Log Message
[Qt] Fix makefile race condition between derived sources and target
r121966 removed too much of the old qmake logic, including the rule
that ensured that qmake_all would not trigger dual runs of qmake --
one of the derived sources -qmake-all rule, and one for making the
derived sources.
We now follow a similar pattern as before, by introducing a custom
target that explicitly depends on the derived sources' qmake-all before
doing a manual run of make. That ensures a single qmake run for the derived
sources.
https://bugs.webkit.org/show_bug.cgi?id=93847
Reviewed by Csaba Osztrogonác.
* qmake/mkspecs/features/functions.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (127582 => 127583)
--- trunk/Tools/ChangeLog 2012-09-05 13:06:01 UTC (rev 127582)
+++ trunk/Tools/ChangeLog 2012-09-05 13:11:35 UTC (rev 127583)
@@ -1,3 +1,23 @@
+2012-09-05 Tor Arne Vestbø
+
+[Qt] Fix makefile race condition between derived sources and target
+
+r121966 removed too much of the old qmake logic, including the rule
+that ensured that qmake_all would not trigger dual runs of qmake --
+one of the derived sources -qmake-all rule, and one for making the
+derived sources.
+
+We now follow a similar pattern as before, by introducing a custom
+target that explicitly depends on the derived sources' qmake-all before
+doing a manual run of make. That ensures a single qmake run for the derived
+sources.
+
+https://bugs.webkit.org/show_bug.cgi?id=93847
+
+Reviewed by Csaba Osztrogonác.
+
+* qmake/mkspecs/features/functions.prf:
+
2012-09-05 Christophe Dumez
WKTR doesn't implement dumpWillCacheResponse()
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (127582 => 127583)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-05 13:06:01 UTC (rev 127582)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-05 13:11:35 UTC (rev 127583)
@@ -137,12 +137,22 @@
first_base_target = sub-$$replace(firstSubdirFile, [^a-zA-Z0-9_], -)
second_base_target = sub-$$replace(secondSubdirFile, [^a-zA-Z0-9_], -)
+# Use a custom target for making the derived sources, as the default target
+# will do 'test -f $(MAKEFILE).DerivedSources || $(QMAKE) ...', which clashes
+# with the qmake-run of the -qmake_all target, and we end up with a race
+# and potentially half-written makefiles. The custom target depends explicitly
+# on -qmake_all, to ensure that we have a makefile, and then calls make.
+derived_make_for_qmake.target = $${first_base_target}-make_for_qmake
+derived_make_for_qmake.depends = $${first_base_target}-qmake_all
+derived_make_for_qmake.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile)
+QMAKE_EXTRA_TARGETS += derived_make_for_qmake
+
# This target ensures that running "make qmake_all" will force both qmake and make
# to be run on the derived sources before running qmake on the target, so that
# qmake can pick up the right dependencies for the target based on the derived
-# sources that were generated. Just "make qmake" is non-recursive anyway.
+# sources that were generated.
target_make_qmake.target = $${second_base_target}-qmake_all
-target_make_qmake.depends = $${first_base_target}
+target_make_qmake.depends = $${derived_make_for_qmake.target}
QMAKE_EXTRA_TARGETS += target_make_qmake
# Make things work even if qmake -r is used.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [127587] trunk/Source/WebCore
Title: [127587] trunk/Source/WebCore
Revision 127587
Author ves...@webkit.org
Date 2012-09-05 07:04:50 -0700 (Wed, 05 Sep 2012)
Log Message
[Qt] Build fix on OS X
Copy/paste-error resulted in us compiling InspectorPageOverlay.h
Reviewed by Ossy.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/DerivedSources.pri
Diff
Modified: trunk/Source/WebCore/ChangeLog (127586 => 127587)
--- trunk/Source/WebCore/ChangeLog 2012-09-05 13:59:19 UTC (rev 127586)
+++ trunk/Source/WebCore/ChangeLog 2012-09-05 14:04:50 UTC (rev 127587)
@@ -1,3 +1,13 @@
+2012-09-05 Tor Arne Vestbø
+
+[Qt] Build fix on OS X
+
+Copy/paste-error resulted in us compiling InspectorPageOverlay.h
+
+Reviewed by Ossy.
+
+* DerivedSources.pri:
+
2012-09-05 Sheriff Bot
Unreviewed, rolling out r127573.
Modified: trunk/Source/WebCore/DerivedSources.pri (127586 => 127587)
--- trunk/Source/WebCore/DerivedSources.pri 2012-09-05 13:59:19 UTC (rev 127586)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-09-05 14:04:50 UTC (rev 127587)
@@ -789,7 +789,7 @@
inspectorOverlayPage.output = InspectorOverlayPage.h
inspectorOverlayPage.input = INSPECTOR_OVERLAY_PAGE
inspectorOverlayPage.commands = perl $$PWD/inspector/xxd.pl InspectorOverlayPage_html ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-injectedScriptSource.add_output_to_sources = false
+inspectorOverlayPage.add_output_to_sources = false
GENERATORS += inspectorOverlayPage
# GENERATOR 2-a: inspector injected script source compiler
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128176] trunk/Tools
Title: [128176] trunk/Tools
Revision 128176
Author ves...@webkit.org
Date 2012-09-11 06:21:53 -0700 (Tue, 11 Sep 2012)
Log Message
[Qt] Fix --qt option to build-webkit
Reviewed by Ossy.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
Diff
Modified: trunk/Tools/ChangeLog (128175 => 128176)
--- trunk/Tools/ChangeLog 2012-09-11 13:11:22 UTC (rev 128175)
+++ trunk/Tools/ChangeLog 2012-09-11 13:21:53 UTC (rev 128176)
@@ -1,5 +1,14 @@
2012-09-11 Tor Arne Vestbø
+[Qt] Fix --qt option to build-webkit
+
+Reviewed by Ossy.
+
+* Scripts/webkitdirs.pm:
+(buildQMakeProjects):
+
+2012-09-11 Tor Arne Vestbø
+
[Qt] Add a configure step to the Qt build system
This allows building the Qt port using just 'qmake WebKit.pro'. Using
Modified: trunk/Tools/Scripts/webkitdirs.pm (128175 => 128176)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 13:11:22 UTC (rev 128175)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 13:21:53 UTC (rev 128176)
@@ -2248,7 +2248,7 @@
} elsif ($passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
-} else {
+} elsif ($passedConfig) {
die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [128179] trunk/Tools
Title: [128179] trunk/Tools
Revision 128179
Author ves...@webkit.org
Date 2012-09-11 06:55:50 -0700 (Tue, 11 Sep 2012)
Log Message
[Qt] Fix passing of defines from the build system
We explicitly have to pass -DENABLE_FOO=0 for every single feature
that's not explicitly enabled in WEBKIT_CONFIG, since Platform.h
will add it's own defaults if the features are not defined.
At some point we might want to run a configure-test to inspect what
Platform.h will do, so we can sync up the build system's view of
the feature-defines with the compile-time situation.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (128178 => 128179)
--- trunk/Tools/ChangeLog 2012-09-11 13:51:45 UTC (rev 128178)
+++ trunk/Tools/ChangeLog 2012-09-11 13:55:50 UTC (rev 128179)
@@ -1,5 +1,21 @@
2012-09-11 Tor Arne Vestbø
+[Qt] Fix passing of defines from the build system
+
+We explicitly have to pass -DENABLE_FOO=0 for every single feature
+that's not explicitly enabled in WEBKIT_CONFIG, since Platform.h
+will add it's own defaults if the features are not defined.
+
+At some point we might want to run a configure-test to inspect what
+Platform.h will do, so we can sync up the build system's view of
+the feature-defines with the compile-time situation.
+
+Reviewed by Simon Hausmann.
+
+* qmake/mkspecs/features/functions.prf:
+
+2012-09-11 Tor Arne Vestbø
+
[Qt] Fix --qt option to build-webkit
Reviewed by Ossy.
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (128178 => 128179)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-11 13:51:45 UTC (rev 128178)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-09-11 13:55:50 UTC (rev 128179)
@@ -360,10 +360,12 @@
# To prevent clashes with Platform.h, we have to explicitly
# disable features that are not enabled.
for(define, FEATURE_DEFAULTS) {
-disabledFeature = $$find(define, =0$)
-isEmpty(disabledFeature): next()
+anyFeatureDefine = $$find(define, =.$)
+isEmpty(anyFeatureDefine): next()
-enabledFeature = $$replace(disabledFeature, =0$, =1)
+enabledFeature = $$replace(anyFeatureDefine, =.$, =1)
+disabledFeature = $$replace(anyFeatureDefine, =.$, =0)
+
!contains(defines, $$enabledFeature) {
defines += $$disabledFeature
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [120183] trunk/Tools
Title: [120183] trunk/Tools
Revision 120183
Author ves...@webkit.org
Date 2012-06-13 04:31:20 -0700 (Wed, 13 Jun 2012)
Log Message
Prevent stderr output from messing up detection of build path
https://bugs.webkit.org/show_bug.cgi?id=88075
Warnings such as 'perl: warning: Setting locale failed' will otherwise
end up as the build path when calling out to webkit-build-directory.
Reviewed by Ojan Vafai.
* Scripts/webkitpy/layout_tests/port/config.py:
(Config.build_directory):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/config.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (120182 => 120183)
--- trunk/Tools/ChangeLog 2012-06-13 11:27:37 UTC (rev 120182)
+++ trunk/Tools/ChangeLog 2012-06-13 11:31:20 UTC (rev 120183)
@@ -1,3 +1,17 @@
+2012-06-13 Tor Arne Vestbø
+
+Prevent stderr output from messing up detection of build path
+
+https://bugs.webkit.org/show_bug.cgi?id=88075
+
+Warnings such as 'perl: warning: Setting locale failed' will otherwise
+end up as the build path when calling out to webkit-build-directory.
+
+Reviewed by Ojan Vafai.
+
+* Scripts/webkitpy/layout_tests/port/config.py:
+(Config.build_directory):
+
2012-06-13 Ryosuke Niwa
Update the builder name for Apple Lion builders.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/config.py (120182 => 120183)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/config.py 2012-06-13 11:27:37 UTC (rev 120182)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/config.py 2012-06-13 11:31:20 UTC (rev 120183)
@@ -78,7 +78,7 @@
if not self._build_directories.get(configuration):
args = ["perl", self.script_path("webkit-build-directory")] + flags
-output = self._executive.run_command(args, cwd=self.webkit_base_dir()).rstrip()
+output = self._executive.run_command(args, cwd=self.webkit_base_dir(), return_stderr=False).rstrip()
parts = output.split("\n")
self._build_directories[configuration] = parts[0]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py (120182 => 120183)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py 2012-06-13 11:27:37 UTC (rev 120182)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py 2012-06-13 11:31:20 UTC (rev 120183)
@@ -46,8 +46,8 @@
def tearDown(self):
config.clear_cached_configuration()
-def make_config(self, output='', files=None, exit_code=0, exception=None, run_command_fn=None):
-e = MockExecutive2(output=output, exit_code=exit_code, exception=exception, run_command_fn=run_command_fn)
+def make_config(self, output='', files=None, exit_code=0, exception=None, run_command_fn=None, stderr=''):
+e = MockExecutive2(output=output, exit_code=exit_code, exception=exception, run_command_fn=run_command_fn, stderr=stderr)
fs = MockFileSystem(files)
return config.Config(e, fs)
@@ -87,6 +87,10 @@
self.assertTrue(c.build_directory('Debug').endswith('/Debug'))
self.assertRaises(KeyError, c.build_directory, 'Unknown')
+# Test that stderr output from webkit-build-directory won't mangle the build dir
+c = self.make_config(output='/WebKitBuild/', stderr="mock stderr output from webkit-build-directory")
+self.assertEqual(c.build_directory(None), '/WebKitBuild/')
+
def test_default_configuration__release(self):
self.assert_configuration('Release', 'Release')
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121336] trunk/Source
Title: [121336] trunk/Source
Revision 121336
Author ves...@webkit.org
Date 2012-06-27 04:30:42 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] Add missing heades to HEADERS
For _javascript_Core there aren't any Qt specific files, so we include all
headers for easy editing in Qt Creator.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Target.pri
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.pro
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (121335 => 121336)
--- trunk/Source/_javascript_Core/ChangeLog 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-06-27 11:30:42 UTC (rev 121336)
@@ -1,3 +1,14 @@
+2012-06-26 Tor Arne Vestbø
+
+[Qt] Add missing heades to HEADERS
+
+For _javascript_Core there aren't any Qt specific files, so we include all
+headers for easy editing in Qt Creator.
+
+Reviewed by Simon Hausmann.
+
+* Target.pri:
+
2012-06-26 Dominic Cooney
[Chromium] Remove unused build scripts and empty folders for _javascript_Core w/ gyp
Modified: trunk/Source/_javascript_Core/Target.pri (121335 => 121336)
--- trunk/Source/_javascript_Core/Target.pri 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/_javascript_Core/Target.pri 2012-06-27 11:30:42 UTC (rev 121336)
@@ -248,6 +248,8 @@
tools/CodeProfiling.cpp \
yarr/YarrJIT.cpp \
+HEADERS += $$files(*.h, true)
+
*sh4* {
QMAKE_CXXFLAGS += -mieee -w
QMAKE_CFLAGS += -mieee -w
Modified: trunk/Source/WTF/ChangeLog (121335 => 121336)
--- trunk/Source/WTF/ChangeLog 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/WTF/ChangeLog 2012-06-27 11:30:42 UTC (rev 121336)
@@ -1,3 +1,14 @@
+2012-06-26 Tor Arne Vestbø
+
+[Qt] Add missing heades to HEADERS
+
+For _javascript_Core there aren't any Qt specific files, so we include all
+headers for easy editing in Qt Creator.
+
+Reviewed by Simon Hausmann.
+
+* WTF.pro:
+
2012-06-25 Kent Tamura
Unreviewed, rolling out r121145.
Modified: trunk/Source/WTF/WTF.pro (121335 => 121336)
--- trunk/Source/WTF/WTF.pro 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/WTF/WTF.pro 2012-06-27 11:30:42 UTC (rev 121336)
@@ -52,6 +52,7 @@
dtoa/utils.h \
DynamicAnnotations.h \
Encoder.h \
+ExportMacros.h \
FastAllocBase.h \
FastMalloc.h \
FixedArray.h \
Modified: trunk/Source/WebCore/ChangeLog (121335 => 121336)
--- trunk/Source/WebCore/ChangeLog 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/WebCore/ChangeLog 2012-06-27 11:30:42 UTC (rev 121336)
@@ -1,3 +1,14 @@
+2012-06-26 Tor Arne Vestbø
+
+[Qt] Add missing heades to HEADERS
+
+For _javascript_Core there aren't any Qt specific files, so we include all
+headers for easy editing in Qt Creator.
+
+Reviewed by Simon Hausmann.
+
+* Target.pri:
+
2012-06-27 Kentaro Hara
Rename Element::rareData() to Element::elementRareData(), and Element::ensureRareData() to Element::ensureElementRareData()
Modified: trunk/Source/WebCore/Target.pri (121335 => 121336)
--- trunk/Source/WebCore/Target.pri 2012-06-27 10:21:55 UTC (rev 121335)
+++ trunk/Source/WebCore/Target.pri 2012-06-27 11:30:42 UTC (rev 121336)
@@ -2385,6 +2385,7 @@
platform/network/ResourceResponseBase.h \
platform/network/qt/DnsPrefetchHelper.h \
platform/network/qt/NetworkStateNotifierPrivate.h \
+platform/PlatformExportMacros.h \
platform/PlatformTouchEvent.h \
platform/PlatformTouchPoint.h \
platform/PopupMenu.h \
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121338] trunk/Source/JavaScriptCore
Title: [121338] trunk/Source/_javascript_Core
Revision 121338
Author ves...@webkit.org
Date 2012-06-27 06:02:03 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] Remove redundant c++11 warning suppression code
This is already handled in default_post.
Patch by Oswald Buddenhagen on 2012-06-27
Reviewed by Tor Arne Vestbø.
* Target.pri:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Target.pri
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (121337 => 121338)
--- trunk/Source/_javascript_Core/ChangeLog 2012-06-27 11:35:06 UTC (rev 121337)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-06-27 13:02:03 UTC (rev 121338)
@@ -1,3 +1,13 @@
+2012-06-27 Oswald Buddenhagen
+
+[Qt] Remove redundant c++11 warning suppression code
+
+This is already handled in default_post.
+
+Reviewed by Tor Arne Vestbø.
+
+* Target.pri:
+
2012-06-26 Tor Arne Vestbø
[Qt] Add missing heades to HEADERS
Modified: trunk/Source/_javascript_Core/Target.pri (121337 => 121338)
--- trunk/Source/_javascript_Core/Target.pri 2012-06-27 11:35:06 UTC (rev 121337)
+++ trunk/Source/_javascript_Core/Target.pri 2012-06-27 13:02:03 UTC (rev 121338)
@@ -261,15 +261,4 @@
# Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
}
-
-# GCC 4.6 and after.
-greaterThan(QT_GCC_MINOR_VERSION, 5) {
-if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
-# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
-QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
-QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
-QMAKE_CFLAGS += -Wno-c++0x-compat
-QMAKE_CXXFLAGS += -Wno-c++0x-compat
-}
-}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121339] trunk/Tools
Title: [121339] trunk/Tools
Revision 121339
Author ves...@webkit.org
Date 2012-06-27 06:05:43 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] Fix lookup location for sqlite sources
Don't look in the install dir - we are unlikely to find anything there
unless we are doing a developer build.
Patch by Oswald Buddenhagen on 2012-06-27
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/features.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (121338 => 121339)
--- trunk/Tools/ChangeLog 2012-06-27 13:02:03 UTC (rev 121338)
+++ trunk/Tools/ChangeLog 2012-06-27 13:05:43 UTC (rev 121339)
@@ -1,3 +1,14 @@
+2012-06-27 Oswald Buddenhagen
+
+[Qt] Fix lookup location for sqlite sources
+
+Don't look in the install dir - we are unlikely to find anything there
+unless we are doing a developer build.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/features.prf:
+
2012-06-27 Zan Dobersek
[Gtk] Add support for the Gamepad API
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121338 => 121339)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-27 13:02:03 UTC (rev 121338)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-27 13:05:43 UTC (rev 121339)
@@ -23,7 +23,7 @@
# Try to locate sqlite3 source
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
isEmpty(SQLITE3SRCDIR) {
-SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
+SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
}
# -- Dynamically detect optional features -
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121340] trunk/Tools
Title: [121340] trunk/Tools
Revision 121340
Author ves...@webkit.org
Date 2012-06-27 07:24:56 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] No need to save and restore TEMPLATE in a function
This was a leftover from when the logic was not in its own function scope.
QMAKE_FRAMEWORK_BUNDLE_NAME on the other hand is exported in qtLibraryTarget, which
will surprisingly affect the global scope as well, so we have to save and restore it.
Original patch by Oswald Buddenhagen on 2012-06-27
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/functions.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (121339 => 121340)
--- trunk/Tools/ChangeLog 2012-06-27 13:05:43 UTC (rev 121339)
+++ trunk/Tools/ChangeLog 2012-06-27 14:24:56 UTC (rev 121340)
@@ -1,3 +1,18 @@
+2012-06-27 Tor Arne Vestbø
+
+[Qt] No need to save and restore TEMPLATE in a function
+
+This was a leftover from when the logic was not in its own function scope.
+
+QMAKE_FRAMEWORK_BUNDLE_NAME on the other hand is exported in qtLibraryTarget, which
+will surprisingly affect the global scope as well, so we have to save and restore it.
+
+Original patch by Oswald Buddenhagen on 2012-06-27
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/functions.prf:
+
2012-06-27 Oswald Buddenhagen
[Qt] Fix lookup location for sqlite sources
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121339 => 121340)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-27 13:05:43 UTC (rev 121339)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-27 14:24:56 UTC (rev 121340)
@@ -234,13 +234,13 @@
defineReplace(resolveFinalLibraryName) {
!debug_and_release: return($$1)
-original_template = $$TEMPLATE
original_framework_name = $$QMAKE_FRAMEWORK_BUNDLE_NAME
TEMPLATE = lib # So that qtLibraryTarget works
target = $$qtLibraryTarget($$1)
-TEMPLATE = $$original_template
+# qtLibraryTarget will export QMAKE_FRAMEWORK_BUNDLE_NAME, which gets
+# exported not only to this function scope, but to our call site.
QMAKE_FRAMEWORK_BUNDLE_NAME = $$original_framework_name
export(QMAKE_FRAMEWORK_BUNDLE_NAME)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121341] trunk/Source/WebCore
Title: [121341] trunk/Source/WebCore
Revision 121341
Author ves...@webkit.org
Date 2012-06-27 07:27:00 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] Remove redundant NDEBUG definition
Already handled in default_post.prf.
Patch by Oswald Buddenhagen on 2012-06-27
Reviewed by Tor Arne Vestbø.
* WebCore.pri:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri
Diff
Modified: trunk/Source/WebCore/ChangeLog (121340 => 121341)
--- trunk/Source/WebCore/ChangeLog 2012-06-27 14:24:56 UTC (rev 121340)
+++ trunk/Source/WebCore/ChangeLog 2012-06-27 14:27:00 UTC (rev 121341)
@@ -1,3 +1,13 @@
+2012-06-27 Oswald Buddenhagen
+
+[Qt] Remove redundant NDEBUG definition
+
+Already handled in default_post.prf.
+
+Reviewed by Tor Arne Vestbø.
+
+* WebCore.pri:
+
2012-06-27 Alexander Pavlov
Unexpected end of style sheet in @font-face rule discards it rather than closes all open constructs
Modified: trunk/Source/WebCore/WebCore.pri (121340 => 121341)
--- trunk/Source/WebCore/WebCore.pri 2012-06-27 14:24:56 UTC (rev 121340)
+++ trunk/Source/WebCore/WebCore.pri 2012-06-27 14:27:00 UTC (rev 121341)
@@ -230,7 +230,6 @@
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
-CONFIG(release, debug|release): DEFINES *= NDEBUG
} else {
INCLUDEPATH += $${SQLITE3SRCDIR}
LIBS += -lsqlite3
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121540] trunk/Tools
Title: [121540] trunk/Tools
Revision 121540
Author ves...@webkit.org
Date 2012-06-29 02:49:10 -0700 (Fri, 29 Jun 2012)
Log Message
[Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS
Patch by Oswald Buddenhagen on 2012-06-27
Reviewed by Tor Arne Vestbø..
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/functions.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (121539 => 121540)
--- trunk/Tools/ChangeLog 2012-06-29 09:44:11 UTC (rev 121539)
+++ trunk/Tools/ChangeLog 2012-06-29 09:49:10 UTC (rev 121540)
@@ -1,3 +1,12 @@
+2012-06-27 Oswald Buddenhagen
+
+[Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS
+
+Reviewed by Tor Arne Vestbø..
+
+* qmake/mkspecs/features/default_post.prf:
+* qmake/mkspecs/features/functions.prf:
+
2012-06-28 Ryosuke Niwa
DOMHTMLCollection::item may return a wrong element after namedItem is called
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (121539 => 121540)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 09:44:11 UTC (rev 121539)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 09:49:10 UTC (rev 121540)
@@ -204,15 +204,13 @@
# More juggling
dependent_libs = $$LIBS
-unset(LIBS)
+LIBS = $$existing_libs
# But we might also need to link against it
needToLink() {
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-LIBS += $$dependent_libs
+LIBS_PRIVATE += $$dependent_libs
}
-
-LIBS = $$existing_libs $$LIBS
}
equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121539 => 121540)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 09:44:11 UTC (rev 121539)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 09:49:10 UTC (rev 121540)
@@ -261,36 +261,29 @@
path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig()
force_static_libs_as_shared {
-LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target
+LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target
} else {
mac {
-LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
+LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
} else:win32-msvc*|wince*|win32-icc {
-LIBS += /OPT:REF -l$$target
+LIBS_PRIVATE += /OPT:REF -l$$target
} else {
-LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
+LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
}
win32-msvc*|wince*|win32-icc {
-LIBS += -L$$path
+LIBS_PRIVATE += -L$$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib
} else {
QMAKE_LIBDIR += $$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}lib$${target}.a
}
-
-# The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies.
-# The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit
-# statically in applications (which isn't used often because, among other things, of licensing obstacles).
-CONFIG -= explicitlib
-CONFIG -= staticlib
}
-export(LIBS)
+export(LIBS_PRIVATE)
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
-export(CONFIG)
return(true)
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121543] trunk
Title: [121543] trunk
Revision 121543
Author ves...@webkit.org
Date 2012-06-29 03:03:14 -0700 (Fri, 29 Jun 2012)
Log Message
[Qt] Don't add Qt module dependencies in features.prf
The required dependencies are already added in WebCore.pri.
Patch by Oswald Buddenhagen on 2012-06-29
Reviewed by Tor Arne Vestbø.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Source/WebCore/ChangeLog (121542 => 121543)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen
+
+[Qt] Don't add Qt module dependencies in features.prf
+
+The required dependencies are already added in WebCore.pri.
+
+Reviewed by Tor Arne Vestbø.
+
+* WebCore.pri:
+
2012-06-29 Taiju Tsuiki
Web Inspector: Add FileSystemView
Modified: trunk/Source/WebCore/WebCore.pri (121542 => 121543)
--- trunk/Source/WebCore/WebCore.pri 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Source/WebCore/WebCore.pri 2012-06-29 10:03:14 UTC (rev 121543)
@@ -171,7 +171,7 @@
MOBILITY *= location
}
-contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
+contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1)|contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
haveQt(5) {
QT += sensors
} else {
Modified: trunk/Tools/ChangeLog (121542 => 121543)
--- trunk/Tools/ChangeLog 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Tools/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen
+
+[Qt] Don't add Qt module dependencies in features.prf
+
+The required dependencies are already added in WebCore.pri.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/features.prf:
+
2012-06-27 Oswald Buddenhagen
[Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121542 => 121543)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-29 10:03:14 UTC (rev 121543)
@@ -145,10 +145,6 @@
contains(MOBILITY_CONFIG, sensors) {
!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
!contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
-
-# FIXME: These should not be here, but in the target that needs them
-CONFIG *= mobility
-MOBILITY *= sensors
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121544] trunk/Tools
Title: [121544] trunk/Tools
Revision 121544
Author ves...@webkit.org
Date 2012-06-29 03:09:59 -0700 (Fri, 29 Jun 2012)
Log Message
[Qt] Make build-webkit reject uknown configurations, eg. --profile
The qmake-based buildsystem doesn't support it.
Patch by Oswald Buddenhagen on 2012-06-29
Reviewed by Tor Arne Vestbø.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
Diff
Modified: trunk/Tools/ChangeLog (121543 => 121544)
--- trunk/Tools/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
+++ trunk/Tools/ChangeLog 2012-06-29 10:09:59 UTC (rev 121544)
@@ -1,5 +1,16 @@
2012-06-29 Oswald Buddenhagen
+[Qt] Make build-webkit reject uknown configurations, eg. --profile
+
+The qmake-based buildsystem doesn't support it.
+
+Reviewed by Tor Arne Vestbø.
+
+* Scripts/webkitdirs.pm:
+(buildQMakeProjects):
+
+2012-06-29 Oswald Buddenhagen
+
[Qt] Don't add Qt module dependencies in features.prf
The required dependencies are already added in WebCore.pri.
Modified: trunk/Tools/Scripts/webkitdirs.pm (121543 => 121544)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-06-29 10:03:14 UTC (rev 121543)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-06-29 10:09:59 UTC (rev 121544)
@@ -2276,6 +2276,8 @@
} elsif ($passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
+} elsif ($passedConfig) {
+die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121545] trunk/Tools
Title: [121545] trunk/Tools
Revision 121545
Author ves...@webkit.org
Date 2012-06-29 03:15:22 -0700 (Fri, 29 Jun 2012)
Log Message
Revert r121540, it broke most Qt builds
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (121544 => 121545)
--- trunk/Tools/ChangeLog 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/ChangeLog 2012-06-29 10:15:22 UTC (rev 121545)
@@ -1,3 +1,10 @@
+2012-06-29 Tor Arne Vestbø
+
+Revert r121540, it broke most Qt builds
+
+* qmake/mkspecs/features/default_post.prf:
+* qmake/mkspecs/features/functions.prf:
+
2012-06-29 Oswald Buddenhagen
[Qt] Make build-webkit reject uknown configurations, eg. --profile
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (121544 => 121545)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-06-29 10:15:22 UTC (rev 121545)
@@ -204,13 +204,15 @@
# More juggling
dependent_libs = $$LIBS
-LIBS = $$existing_libs
+unset(LIBS)
# But we might also need to link against it
needToLink() {
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-LIBS_PRIVATE += $$dependent_libs
+LIBS += $$dependent_libs
}
+
+LIBS = $$existing_libs $$LIBS
}
equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121544 => 121545)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 10:09:59 UTC (rev 121544)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-29 10:15:22 UTC (rev 121545)
@@ -261,29 +261,36 @@
path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig()
force_static_libs_as_shared {
-LIBS_PRIVATE += -L$${ROOT_BUILD_DIR}/lib -l$$target
+LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target
} else {
mac {
-LIBS_PRIVATE += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
+LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a
} else:win32-msvc*|wince*|win32-icc {
-LIBS_PRIVATE += /OPT:REF -l$$target
+LIBS += /OPT:REF -l$$target
} else {
-LIBS_PRIVATE += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
+LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive
}
win32-msvc*|wince*|win32-icc {
-LIBS_PRIVATE += -L$$path
+LIBS += -L$$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib
} else {
QMAKE_LIBDIR += $$path
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}lib$${target}.a
}
+
+# The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies.
+# The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit
+# statically in applications (which isn't used often because, among other things, of licensing obstacles).
+CONFIG -= explicitlib
+CONFIG -= staticlib
}
-export(LIBS_PRIVATE)
+export(LIBS)
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
+export(CONFIG)
return(true)
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121670] trunk/Tools
Title: [121670] trunk/Tools
Revision 121670
Author ves...@webkit.org
Date 2012-07-02 04:27:48 -0700 (Mon, 02 Jul 2012)
Log Message
[Qt] Simplify detection of non-installed module file
Has the additional advantage that we do not rely on additional information.
Patch by Oswald Buddenhagen on 2012-06-29
Reviewed by Tor Arne Vestbø.
* qmake/qt_webkit.pri:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/qt_webkit.pri
Diff
Modified: trunk/Tools/ChangeLog (121669 => 121670)
--- trunk/Tools/ChangeLog 2012-07-02 10:55:19 UTC (rev 121669)
+++ trunk/Tools/ChangeLog 2012-07-02 11:27:48 UTC (rev 121670)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen
+
+[Qt] Simplify detection of non-installed module file
+
+Has the additional advantage that we do not rely on additional information.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/qt_webkit.pri:
+
2012-07-01 Christophe Dumez
[EFL] Add Gamepad support
Modified: trunk/Tools/qmake/qt_webkit.pri (121669 => 121670)
--- trunk/Tools/qmake/qt_webkit.pri 2012-07-02 10:55:19 UTC (rev 121669)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-07-02 11:27:48 UTC (rev 121670)
@@ -29,9 +29,7 @@
QT_WEBKIT_PATCH_VERSION = $$QT.webkit.PATCH_VERSION
unix:!mac {
-install_prefix = $$find(_FILE_, ^$$[QT_INSTALL_PREFIX])
-module_prefix = $$find(QMAKE_EXTRA_MODULE_FORWARDS, ^$$dirname(QT_MODULE_BIN_BASE))
-isEmpty(install_prefix):!isEmpty(module_prefix) {
+!isEmpty(QT_MODULE_LIB_BASE):!equals(QT_MODULE_LIB_BASE, $$[QT_INSTALL_LIBS]) {
# We are loading the qt_webkit.pri forwarding file from the
# local webkit build directory, so set up rpath to point to
# to the local build. This ensures that any of the WebKit tools
@@ -40,6 +38,4 @@
# party applications that set QMAKE_EXTRA_MODULE_FORWARDS.
QMAKE_LFLAGS *= "$${QMAKE_LFLAGS_RPATH}$${QT_MODULE_LIB_BASE}"
}
-unset(install_prefix)
-unset(module_prefix)
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121766] trunk
Title: [121766] trunk Revision 121766 Author ves...@webkit.org Date 2012-07-03 08:23:20 -0700 (Tue, 03 Jul 2012) Log Message [Qt] Make use of .qmake.cache for caching features Instead of loading() features from the files that need them (and re-running a bunch of checks), we now run feature detection as part of configure.pro, and have build-webkit write the computed feature-defines and CONFIG to .qmake.cache, which is then loaded by qmake _before_ even defaults_pre when building WebKit.pro. At some point we'll be able to selectivly prevent running of config tests in configure.pro, which means we don't need a separate code-path for the build-webkit --help case. We should also move the code in build-webkit that now uses .webkit.config to detect clean builds, to use .qmake.cache, since we now store the same thing there. Original patch by Oswald Buddenhagen https://bugs.webkit.org/show_bug.cgi?id=90461 Reviewed by Tor Arne Vestbø. Modified Paths trunk/ChangeLog trunk/Source/QtWebKit.pro trunk/Source/WTF/ChangeLog trunk/Source/WTF/WTF.pri trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/DerivedSources.pri trunk/Source/WebCore/WebCore.pri trunk/Source/WebKit/qt/ChangeLog trunk/Source/WebKit/qt/declarative/declarative.pro trunk/Source/WebKit/qt/declarative/public.pri trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/DerivedSources.pri trunk/Source/WebKit2/Target.pri trunk/Source/api.pri trunk/Source/tests.pri trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro trunk/Tools/QtTestBrowser/QtTestBrowser.pro trunk/Tools/Scripts/webkitdirs.pm trunk/Tools/Tools.pro trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri trunk/Tools/WebKitTestRunner/Target.pri trunk/Tools/qmake/configure.pro trunk/Tools/qmake/mkspecs/features/default_post.prf trunk/Tools/qmake/mkspecs/features/default_pre.prf trunk/Tools/qmake/mkspecs/features/features.prf trunk/WebKit.pro Added Paths trunk/Tools/qmake/.qmake.conf Diff Modified: trunk/ChangeLog (121765 => 121766) --- trunk/ChangeLog 2012-07-03 15:00:09 UTC (rev 121765) +++ trunk/ChangeLog 2012-07-03 15:23:20 UTC (rev 121766) @@ -1,3 +1,30 @@ +2012-07-03 Tor Arne Vestbø + +[Qt] Make use of .qmake.cache for caching features + +Instead of loading() features from the files that need them (and re-running +a bunch of checks), we now run feature detection as part of configure.pro, +and have build-webkit write the computed feature-defines and CONFIG to +.qmake.cache, which is then loaded by qmake _before_ even defaults_pre +when building WebKit.pro. + +At some point we'll be able to selectivly prevent running of config tests +in configure.pro, which means we don't need a separate code-path for +the build-webkit --help case. + +We should also move the code in build-webkit that now uses .webkit.config +to detect clean builds, to use .qmake.cache, since we now store the same +thing there. + +Original patch by Oswald Buddenhagen + +Reviewed by Tor Arne Vestbø. + +* Source/QtWebKit.pro: +* Source/api.pri: +* Source/tests.pri: +* WebKit.pro: + 2012-07-03 Christophe Dumez [EFL] Enable MICRODATA support Modified: trunk/Source/QtWebKit.pro (121765 => 121766) --- trunk/Source/QtWebKit.pro 2012-07-03 15:00:09 UTC (rev 121765) +++ trunk/Source/QtWebKit.pro 2012-07-03 15:23:20 UTC (rev 121766) @@ -4,8 +4,6 @@ # See 'Tools/qmake/README' for an overview of the build system # --- -load(features) - TEMPLATE = subdirs CONFIG += ordered Modified: trunk/Source/WTF/ChangeLog (121765 => 121766) --- trunk/Source/WTF/ChangeLog 2012-07-03 15:00:09 UTC (rev 121765) +++ trunk/Source/WTF/ChangeLog 2012-07-03 15:23:20 UTC (rev 121766) @@ -1,3 +1,27 @@ +2012-07-03 Tor Arne Vestbø + +[Qt] Make use of .qmake.cache for caching features + +Instead of loading() features from the files that need them (and re-running +a bunch of checks), we now run feature detection as part of configure.pro, +and have build-webkit write the computed feature-defines and CONFIG to +.qmake.cache, which is then loaded by qmake _before_ even defaults_pre +when building WebKit.pro. + +At some point we'll be able to selectivly prevent running of config tests +in configure.pro, which means we don't need a separate code-path for +the build-webkit --help case. + +We should also move the code in build-webkit that now uses .webkit.config +to detect clean builds, to use .qmake.cache, since we now store the same +thing there. + +Original patch by Oswald Buddenhagen + +Reviewed by Tor Arne Vestbø. + +* WTF.pri: + 2012-07-03 Jo
[webkit-changes] [121777] trunk
Title: [121777] trunk Revision 121777 Author ves...@webkit.org Date 2012-07-03 09:22:10 -0700 (Tue, 03 Jul 2012) Log Message [Qt] Make use of .qmake.cache for caching features Instead of loading() features from the files that need them (and re-running a bunch of checks), we now run feature detection as part of configure.pro, and have build-webkit write the computed feature-defines and CONFIG to .qmake.cache, which is then loaded by qmake _before_ even defaults_pre when building WebKit.pro. At some point we'll be able to selectivly prevent running of config tests in configure.pro, which means we don't need a separate code-path for the build-webkit --help case. We should also move the code in build-webkit that now uses .webkit.config to detect clean builds, to use .qmake.cache, since we now store the same thing there. Original patch by Oswald Buddenhagen https://bugs.webkit.org/show_bug.cgi?id=90461 Reviewed by Tor Arne Vestbø. Modified Paths trunk/ChangeLog trunk/Source/QtWebKit.pro trunk/Source/WTF/ChangeLog trunk/Source/WTF/WTF.pri trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/DerivedSources.pri trunk/Source/WebCore/WebCore.pri trunk/Source/WebKit/qt/ChangeLog trunk/Source/WebKit/qt/declarative/declarative.pro trunk/Source/WebKit/qt/declarative/public.pri trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/DerivedSources.pri trunk/Source/WebKit2/Target.pri trunk/Source/api.pri trunk/Source/tests.pri trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro trunk/Tools/QtTestBrowser/QtTestBrowser.pro trunk/Tools/Scripts/webkitdirs.pm trunk/Tools/Tools.pro trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri trunk/Tools/WebKitTestRunner/Target.pri trunk/Tools/qmake/configure.pro trunk/Tools/qmake/mkspecs/features/default_post.prf trunk/Tools/qmake/mkspecs/features/default_pre.prf trunk/Tools/qmake/mkspecs/features/features.prf trunk/WebKit.pro Added Paths trunk/Tools/qmake/.qmake.conf Diff Modified: trunk/ChangeLog (121776 => 121777) --- trunk/ChangeLog 2012-07-03 16:15:24 UTC (rev 121776) +++ trunk/ChangeLog 2012-07-03 16:22:10 UTC (rev 121777) @@ -1,3 +1,30 @@ +2012-07-03 Tor Arne Vestbø + +[Qt] Make use of .qmake.cache for caching features + +Instead of loading() features from the files that need them (and re-running +a bunch of checks), we now run feature detection as part of configure.pro, +and have build-webkit write the computed feature-defines and CONFIG to +.qmake.cache, which is then loaded by qmake _before_ even defaults_pre +when building WebKit.pro. + +At some point we'll be able to selectivly prevent running of config tests +in configure.pro, which means we don't need a separate code-path for +the build-webkit --help case. + +We should also move the code in build-webkit that now uses .webkit.config +to detect clean builds, to use .qmake.cache, since we now store the same +thing there. + +Original patch by Oswald Buddenhagen + +Reviewed by Tor Arne Vestbø. + +* Source/QtWebKit.pro: +* Source/api.pri: +* Source/tests.pri: +* WebKit.pro: + 2012-07-03 Sheriff Bot Unreviewed, rolling out r121766. Modified: trunk/Source/QtWebKit.pro (121776 => 121777) --- trunk/Source/QtWebKit.pro 2012-07-03 16:15:24 UTC (rev 121776) +++ trunk/Source/QtWebKit.pro 2012-07-03 16:22:10 UTC (rev 121777) @@ -4,8 +4,6 @@ # See 'Tools/qmake/README' for an overview of the build system # --- -load(features) - TEMPLATE = subdirs CONFIG += ordered Modified: trunk/Source/WTF/ChangeLog (121776 => 121777) --- trunk/Source/WTF/ChangeLog 2012-07-03 16:15:24 UTC (rev 121776) +++ trunk/Source/WTF/ChangeLog 2012-07-03 16:22:10 UTC (rev 121777) @@ -1,3 +1,27 @@ +2012-07-03 Tor Arne Vestbø + +[Qt] Make use of .qmake.cache for caching features + +Instead of loading() features from the files that need them (and re-running +a bunch of checks), we now run feature detection as part of configure.pro, +and have build-webkit write the computed feature-defines and CONFIG to +.qmake.cache, which is then loaded by qmake _before_ even defaults_pre +when building WebKit.pro. + +At some point we'll be able to selectivly prevent running of config tests +in configure.pro, which means we don't need a separate code-path for +the build-webkit --help case. + +We should also move the code in build-webkit that now uses .webkit.config +to detect clean builds, to use .qmake.cache, since we now store the same +thing there. + +Original patch by Oswald Buddenhagen + +Reviewed by Tor Arne Vestbø. + +* WTF.pri: + 2012-07-03 Sheri
[webkit-changes] [121845] trunk/Source/WebKit
Title: [121845] trunk/Source/WebKit
Revision 121845
Author ves...@webkit.org
Date 2012-07-04 06:41:19 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Fix broken OR-operator in project file
Qmake expects |, not ||. The result was that the block was entered, even
if none of the two defines were set to 1.
Reviewed by Jocelyn Turcotte.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit1.pri
Diff
Modified: trunk/Source/WebKit/ChangeLog (121844 => 121845)
--- trunk/Source/WebKit/ChangeLog 2012-07-04 12:57:58 UTC (rev 121844)
+++ trunk/Source/WebKit/ChangeLog 2012-07-04 13:41:19 UTC (rev 121845)
@@ -1,3 +1,14 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Fix broken OR-operator in project file
+
+Qmake expects |, not ||. The result was that the block was entered, even
+if none of the two defines were set to 1.
+
+Reviewed by Jocelyn Turcotte.
+
+* WebKit1.pri:
+
2012-07-03 Christophe Dumez
[EFL] Move BatteryClientEfl from WebKit to WebCore
Modified: trunk/Source/WebKit/WebKit1.pri (121844 => 121845)
--- trunk/Source/WebKit/WebKit1.pri 2012-07-04 12:57:58 UTC (rev 121844)
+++ trunk/Source/WebKit/WebKit1.pri 2012-07-04 13:41:19 UTC (rev 121845)
@@ -27,7 +27,7 @@
}
}
-contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) || contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1) {
+contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1)|contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1) {
haveQt(5) {
QT += sensors
} else {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121846] trunk/Tools
Title: [121846] trunk/Tools
Revision 121846
Author ves...@webkit.org
Date 2012-07-04 06:44:15 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Fix haveQtModule() check
Without {} brackets we were pulling out the value of the module.name variable.
Reviewed by Jocelyn Turcotte.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/functions.prf
Diff
Modified: trunk/Tools/ChangeLog (121845 => 121846)
--- trunk/Tools/ChangeLog 2012-07-04 13:41:19 UTC (rev 121845)
+++ trunk/Tools/ChangeLog 2012-07-04 13:44:15 UTC (rev 121846)
@@ -1,3 +1,13 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Fix haveQtModule() check
+
+Without {} brackets we were pulling out the value of the module.name variable.
+
+Reviewed by Jocelyn Turcotte.
+
+* qmake/mkspecs/features/functions.prf:
+
2012-07-04 Sergio Villar Senin
[WK2] [GTK] WK2 testing bot unable to find the InjectedBundle library
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121845 => 121846)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-07-04 13:41:19 UTC (rev 121845)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-07-04 13:44:15 UTC (rev 121846)
@@ -207,8 +207,9 @@
defineTest(haveQtModule) {
unset(module)
module = $$1
-haveQt(4):contains(QT_CONFIG, $$module): return(true)
-haveQt(5):!isEmpty(QT.$$module.name): return(true)
+
+haveQt(4):contains(QT_CONFIG, $${module}): return(true)
+haveQt(5):!isEmpty(QT.$${module}.name): return(true)
return(false)
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121847] trunk/Tools
Title: [121847] trunk/Tools
Revision 121847
Author ves...@webkit.org
Date 2012-07-04 06:48:44 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Use haveQtModule() in project files instead of manual checks
Reviewed by Jocelyn Turcotte.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (121846 => 121847)
--- trunk/Tools/ChangeLog 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847)
@@ -1,5 +1,14 @@
2012-07-04 Tor Arne Vestbø
+[Qt] Use haveQtModule() in project files instead of manual checks
+
+Reviewed by Jocelyn Turcotte.
+
+* qmake/mkspecs/features/default_pre.prf:
+* qmake/mkspecs/features/features.prf:
+
+2012-07-04 Tor Arne Vestbø
+
[Qt] Fix haveQtModule() check
Without {} brackets we were pulling out the value of the module.name variable.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121846 => 121847)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 13:48:44 UTC (rev 121847)
@@ -107,7 +107,7 @@
}
haveQt(5): {
-isEmpty(QT.widgets.name)|isEmpty(QT.printsupport.name) {
+!haveQtModule(widgets)|!haveQtModule(printsupport) {
root_project_file: message("WebKit1 requires the QtWidgets and QtPrintSupport modules. Disabling WebKit1.")
CONFIG += no_webkit1
}
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121846 => 121847)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-04 13:48:44 UTC (rev 121847)
@@ -105,7 +105,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
+haveQt(4)|haveQtModule(widgets): DEFINES += HAVE_QSTYLE=1
# WebGL support
!contains(DEFINES, ENABLE_WEBGL=.) {
@@ -129,7 +129,7 @@
# orientation support
haveQt(5) {
-!isEmpty(QT.sensors.name) {
+haveQtModule(sensors) {
!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
!contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121848] trunk
Title: [121848] trunk Revision 121848 Author ves...@webkit.org Date 2012-07-04 06:54:43 -0700 (Wed, 04 Jul 2012) Log Message [Qt] Remove a few un-needed load(features) after r121777 The features are computed by configure.pro and cached in .qmake.cache. Reviewed by Jocelyn Turcotte. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit1.pro trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/qt/raw/Target.pri Diff Modified: trunk/Source/WebKit/ChangeLog (121847 => 121848) --- trunk/Source/WebKit/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847) +++ trunk/Source/WebKit/ChangeLog 2012-07-04 13:54:43 UTC (rev 121848) @@ -1,5 +1,15 @@ 2012-07-04 Tor Arne Vestbø +[Qt] Remove a few un-needed load(features) after r121777 + +The features are computed by configure.pro and cached in .qmake.cache. + +Reviewed by Jocelyn Turcotte. + +* WebKit1.pro: + +2012-07-04 Tor Arne Vestbø + [Qt] Fix broken OR-operator in project file Qmake expects |, not ||. The result was that the block was entered, even Modified: trunk/Source/WebKit/WebKit1.pro (121847 => 121848) --- trunk/Source/WebKit/WebKit1.pro 2012-07-04 13:48:44 UTC (rev 121847) +++ trunk/Source/WebKit/WebKit1.pro 2012-07-04 13:54:43 UTC (rev 121848) @@ -7,8 +7,6 @@ TEMPLATE = lib TARGET = WebKit1 -load(features) - include(WebKit1.pri) WEBKIT += wtf _javascript_core webcore Modified: trunk/Tools/ChangeLog (121847 => 121848) --- trunk/Tools/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847) +++ trunk/Tools/ChangeLog 2012-07-04 13:54:43 UTC (rev 121848) @@ -1,5 +1,15 @@ 2012-07-04 Tor Arne Vestbø +[Qt] Remove a few un-needed load(features) after r121777 + +The features are computed by configure.pro and cached in .qmake.cache. + +Reviewed by Jocelyn Turcotte.. + +* MiniBrowser/qt/raw/Target.pri: + +2012-07-04 Tor Arne Vestbø + [Qt] Use haveQtModule() in project files instead of manual checks Reviewed by Jocelyn Turcotte. Modified: trunk/Tools/MiniBrowser/qt/raw/Target.pri (121847 => 121848) --- trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-07-04 13:48:44 UTC (rev 121847) +++ trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-07-04 13:54:43 UTC (rev 121848) @@ -11,6 +11,4 @@ QT = core gui network webkit -load(features) - WEBKIT += wtf _javascript_core webkit2 ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121851] trunk
Title: [121851] trunk
Revision 121851
Author ves...@webkit.org
Date 2012-07-04 07:21:59 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Get rid of un-needed QT += declarative for Qt 5
The declarative module has been renamed to quick1 in Qt 5, and the
engine-only module for Qt 5 is named 'qml'. For many of the instances
we could just remove 'declarative', since the project file was only
used for Qt5/WebKit2 builds. In the other cases the module was wrapped
in a haveQt(4) scope.
Reviewed by Csaba Osztrogonác.
Modified Paths
trunk/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.pri
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/declarative/experimental/experimental.pri
trunk/Source/WebKit/qt/declarative/public.pri
trunk/Source/api.pri
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowser.pro
trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri
trunk/Tools/WebKitTestRunner/Target.pri
Diff
Modified: trunk/ChangeLog (121850 => 121851)
--- trunk/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,17 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Get rid of un-needed QT += declarative for Qt 5
+
+The declarative module has been renamed to quick1 in Qt 5, and the
+engine-only module for Qt 5 is named 'qml'. For many of the instances
+we could just remove 'declarative', since the project file was only
+used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+in a haveQt(4) scope.
+
+Reviewed by Csaba Osztrogonác.
+
+* Source/api.pri:
+
2012-07-03 Christophe Dumez
[EFL] Enable CSS variables support at compile time
Modified: trunk/Source/WTF/ChangeLog (121850 => 121851)
--- trunk/Source/WTF/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WTF/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,17 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Get rid of un-needed QT += declarative for Qt 5
+
+The declarative module has been renamed to quick1 in Qt 5, and the
+engine-only module for Qt 5 is named 'qml'. For many of the instances
+we could just remove 'declarative', since the project file was only
+used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+in a haveQt(4) scope.
+
+Reviewed by Csaba Osztrogonác.
+
+* WTF.pri:
+
2012-07-03 Yong Li
[BlackBerry] Turn on DFGJIT in Platform.h
Modified: trunk/Source/WTF/WTF.pri (121850 => 121851)
--- trunk/Source/WTF/WTF.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WTF/WTF.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -28,7 +28,7 @@
!haveQt(5): error("To build QtWebKit+V8 you need to use Qt 5")
DEFINES *= WTF_USE_V8=1
INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/v8/ForwardingHeaders
-QT += v8-private declarative
+QT += v8-private
}
linux-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
Modified: trunk/Source/WebKit/qt/ChangeLog (121850 => 121851)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,18 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Get rid of un-needed QT += declarative for Qt 5
+
+The declarative module has been renamed to quick1 in Qt 5, and the
+engine-only module for Qt 5 is named 'qml'. For many of the instances
+we could just remove 'declarative', since the project file was only
+used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+in a haveQt(4) scope.
+
+Reviewed by Csaba Osztrogonác.
+
+* declarative/experimental/experimental.pri:
+* declarative/public.pri:
+
2012-07-03 Tor Arne Vestbø
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (121850 => 121851)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -24,7 +24,7 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += declarative widgets network quick quick-private webkit webkit-private
+QT += widgets network quick quick-private webkit webkit-private
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
Modified: trunk/Source/WebKit/qt/declarative/public.pri (121850 => 121851)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -24,7 +24,8 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += declarative webkit webkit-private
+QT += webkit webkit-private
+haveQt(4): QT += declarative
haveQt(5): QT += widgets quick quick-private
contains(DEFINES, HAVE_QQUICK1=1) {
Modified: trunk/Source/api
[webkit-changes] [121854] trunk/Tools
Title: [121854] trunk/Tools
Revision 121854
Author ves...@webkit.org
Date 2012-07-04 08:13:24 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Don't try to build WTR twice
Reviewed by Csaba Osztrogonác.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Tools.pro
Diff
Modified: trunk/Tools/ChangeLog (121853 => 121854)
--- trunk/Tools/ChangeLog 2012-07-04 15:06:41 UTC (rev 121853)
+++ trunk/Tools/ChangeLog 2012-07-04 15:13:24 UTC (rev 121854)
@@ -1,3 +1,11 @@
+2012-07-04 Tor Arne Vestbø
+
+[Qt] Don't try to build WTR twice
+
+Reviewed by Csaba Osztrogonác.
+
+* Tools.pro:
+
2012-07-04 Sheriff Bot
Unreviewed, rolling out r121821.
Modified: trunk/Tools/Tools.pro (121853 => 121854)
--- trunk/Tools/Tools.pro 2012-07-04 15:06:41 UTC (rev 121853)
+++ trunk/Tools/Tools.pro 2012-07-04 15:13:24 UTC (rev 121854)
@@ -14,12 +14,11 @@
}
!no_webkit2 {
-SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
-SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
-
# WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
!no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+
+SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
+SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
}
# FIXME: with Qt 5 the test plugin cause some trouble during layout tests.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121856] trunk/Tools
Title: [121856] trunk/Tools
Revision 121856
Author ves...@webkit.org
Date 2012-07-04 08:19:33 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Replace deprecated IN_PWD with PWD
Reviewed by Csaba Osztrogonác.
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf
Diff
Modified: trunk/Tools/ChangeLog (121855 => 121856)
--- trunk/Tools/ChangeLog 2012-07-04 15:14:01 UTC (rev 121855)
+++ trunk/Tools/ChangeLog 2012-07-04 15:19:33 UTC (rev 121856)
@@ -1,5 +1,13 @@
2012-07-04 Tor Arne Vestbø
+[Qt] Replace deprecated IN_PWD with PWD
+
+Reviewed by Csaba Osztrogonác.
+
+* qmake/mkspecs/features/default_pre.prf:
+
+2012-07-04 Tor Arne Vestbø
+
[Qt] Don't try to build WTR twice
Reviewed by Csaba Osztrogonác.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121855 => 121856)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 15:14:01 UTC (rev 121855)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 15:19:33 UTC (rev 121856)
@@ -23,7 +23,7 @@
}
# Resolve root directories for source and build
-ROOT_WEBKIT_DIR = $$replace(IN_PWD, /Tools/qmake/mkspecs/features$,)
+ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,)
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [121901] trunk/Tools
Title: [121901] trunk/Tools
Revision 121901
Author ves...@webkit.org
Date 2012-07-05 06:10:04 -0700 (Thu, 05 Jul 2012)
Log Message
[Qt] Remove rpath-hacks in qt_webkit.pri
Having it in qt_webkit.pri meant that all client apps would inherit the rpath,
even if they were not using QtWebKit.
This is a regression for people who build client apps against a non-installed
QtWebKit, as the client app will be missing a rpath to the standalone WebKit
build dir. This can be solved by LD_LIBRARY_PATH or custom QMAKE_RPATHDIR
logic, until the real issue is fixed in Qt.
Reviewed by Csaba Osztrogonác.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/rpath.prf
trunk/Tools/qmake/qt_webkit.pri
Diff
Modified: trunk/Tools/ChangeLog (121900 => 121901)
--- trunk/Tools/ChangeLog 2012-07-05 12:31:56 UTC (rev 121900)
+++ trunk/Tools/ChangeLog 2012-07-05 13:10:04 UTC (rev 121901)
@@ -1,3 +1,20 @@
+2012-07-05 Tor Arne Vestbø
+
+[Qt] Remove rpath-hacks in qt_webkit.pri
+
+Having it in qt_webkit.pri meant that all client apps would inherit the rpath,
+even if they were not using QtWebKit.
+
+This is a regression for people who build client apps against a non-installed
+QtWebKit, as the client app will be missing a rpath to the standalone WebKit
+build dir. This can be solved by LD_LIBRARY_PATH or custom QMAKE_RPATHDIR
+logic, until the real issue is fixed in Qt.
+
+Reviewed by Csaba Osztrogonác.
+
+* qmake/mkspecs/features/rpath.prf:
+* qmake/qt_webkit.pri:
+
2012-07-05 Dongwoo Im
[EFL] Enable the CUSTOM_SCHEME_HANDLER feature as default.
Modified: trunk/Tools/qmake/mkspecs/features/rpath.prf (121900 => 121901)
--- trunk/Tools/qmake/mkspecs/features/rpath.prf 2012-07-05 12:31:56 UTC (rev 121900)
+++ trunk/Tools/qmake/mkspecs/features/rpath.prf 2012-07-05 13:10:04 UTC (rev 121901)
@@ -1,23 +1,25 @@
# ---
# Set rpath for the application/library we're building
#
-# Only used by Qt4.
-#
# See 'Tools/qmake/README' for an overview of the build system
# ---
-haveQt(4) {
-equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib
+equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib
-linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
-# Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
-QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR}
-RPATH = $$join(QMAKE_RPATHDIR, ":")
+linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
+# Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
+QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR}
+RPATH = $$join(QMAKE_RPATHDIR, ":")
-QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${RPATH}\'
-QMAKE_RPATHDIR =
-} else {
-QMAKE_RPATHDIR = $${ROOT_BUILD_DIR}/lib $${QMAKE_RPATHDIR}
-}
+QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${RPATH}\'
+QMAKE_RPATHDIR =
+} else {
+QMAKE_RPATHDIR = $${ROOT_BUILD_DIR}/lib $${QMAKE_RPATHDIR}
}
+
+# FIXME: For Qt5 this will only give correct rpath for the tools that come with WebKit
+# Any client application built against a developer-build of Qt + WebKit (that does
+# QT += webkit) will not get the rpath pointing to the stand-alone WebKit-build,
+# and will have to set LD_LIBRARY_PATH or do their own rpath logic. This needs
+# to be fixed on the Qt side.
Modified: trunk/Tools/qmake/qt_webkit.pri (121900 => 121901)
--- trunk/Tools/qmake/qt_webkit.pri 2012-07-05 12:31:56 UTC (rev 121900)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-07-05 13:10:04 UTC (rev 121901)
@@ -27,15 +27,3 @@
QT_WEBKIT_MAJOR_VERSION = $$QT.webkit.MAJOR_VERSION
QT_WEBKIT_MINOR_VERSION = $$QT.webkit.MINOR_VERSION
QT_WEBKIT_PATCH_VERSION = $$QT.webkit.PATCH_VERSION
-
-unix:!mac {
-!isEmpty(QT_MODULE_LIB_BASE):!equals(QT_MODULE_LIB_BASE, $$[QT_INSTALL_LIBS]) {
-# We are loading the qt_webkit.pri forwarding file from the
-# local webkit build directory, so set up rpath to point to
-# to the local build. This ensures that any of the WebKit tools
-# such as WebKitTestRunner and QtTestBrowser will link to the
-# non-installed QtWebKit library. The same applies to third-
-# party applications that set QMAKE_EXTRA_MODULE_FORWARDS.
-QMAKE_LFLAGS *= "$${QMAKE_LFLAGS_RPATH}$${QT_MODULE_LIB_BASE}"
-}
-}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-change
[webkit-changes] [121910] trunk
Title: [121910] trunk
Revision 121910
Author ves...@webkit.org
Date 2012-07-05 09:39:54 -0700 (Thu, 05 Jul 2012)
Log Message
[Qt] Move Webkit1 before WebKit2 in the build order
Reviewed by Csaba Osztrogonác.
* WebKit.pro:
Modified Paths
trunk/ChangeLog
trunk/WebKit.pro
Diff
Modified: trunk/ChangeLog (121909 => 121910)
--- trunk/ChangeLog 2012-07-05 16:21:43 UTC (rev 121909)
+++ trunk/ChangeLog 2012-07-05 16:39:54 UTC (rev 121910)
@@ -1,3 +1,11 @@
+2012-07-05 Tor Arne Vestbø
+
+[Qt] Move Webkit1 before WebKit2 in the build order
+
+Reviewed by Csaba Osztrogonác.
+
+* WebKit.pro:
+
2012-07-05 Ryuan Choi
[CMAKE] Unreviewd typo fix after r121857
Modified: trunk/WebKit.pro (121909 => 121910)
--- trunk/WebKit.pro 2012-07-05 16:21:43 UTC (rev 121909)
+++ trunk/WebKit.pro 2012-07-05 16:39:54 UTC (rev 121910)
@@ -28,18 +28,18 @@
WebCore.makefile = Makefile.WebCore
SUBDIRS += WebCore
+!no_webkit1 {
+webkit1.file = Source/WebKit/WebKit1.pro
+webkit1.makefile = Makefile.WebKit1
+SUBDIRS += webkit1
+}
+
!no_webkit2 {
webkit2.file = Source/WebKit2/WebKit2.pro
webkit2.makefile = Makefile.WebKit2
SUBDIRS += webkit2
}
-!no_webkit1 {
-webkit1.file = Source/WebKit/WebKit1.pro
-webkit1.makefile = Makefile.WebKit1
-SUBDIRS += webkit1
-}
-
QtWebKit.file = Source/QtWebKit.pro
QtWebKit.makefile = Makefile.QtWebKit
SUBDIRS += QtWebKit
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [116107] trunk
Title: [116107] trunk
Revision 116107
Author ves...@webkit.org
Date 2012-05-04 09:09:33 -0700 (Fri, 04 May 2012)
Log Message
[Qt] Clean up and split features.prf into a static list of defaults
The static list of feature defaults is used as a fallback for any
feature that's not dynamically detected or overriden on the command
line (though build-webkit or passing DEFINES+= to qmake).
The static list is complete, which allows for auto-generation based
on Features.py (see bug https://bugs.webkit.org/show_bug.cgi?id=85456)
https://bugs.webkit.org/show_bug.cgi?id=85611
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-webkit
trunk/Tools/Tools.pro
trunk/Tools/qmake/mkspecs/features/features.prf
Added Paths
trunk/Tools/qmake/mkspecs/features/features.pri
Diff
Modified: trunk/Source/WebCore/ChangeLog (116106 => 116107)
--- trunk/Source/WebCore/ChangeLog 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Source/WebCore/ChangeLog 2012-05-04 16:09:33 UTC (rev 116107)
@@ -1,3 +1,20 @@
+2012-05-04 Tor Arne Vestbø
+
+[Qt] Clean up and split features.prf into a static list of defaults
+
+The static list of feature defaults is used as a fallback for any
+feature that's not dynamically detected or overriden on the command
+line (though build-webkit or passing DEFINES+= to qmake).
+
+The static list is complete, which allows for auto-generation based
+on Features.py (see bug https://bugs.webkit.org/show_bug.cgi?id=85456)
+
+https://bugs.webkit.org/show_bug.cgi?id=85611
+
+Reviewed by Simon Hausmann.
+
+* Target.pri:
+
2012-05-04 Sheriff Bot
Unreviewed, rolling out r116085, r116091, and r116095.
Modified: trunk/Source/WebCore/Target.pri (116106 => 116107)
--- trunk/Source/WebCore/Target.pri 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Source/WebCore/Target.pri 2012-05-04 16:09:33 UTC (rev 116107)
@@ -4124,7 +4124,7 @@
DEFINES += QT_OPENGL_SHIMS=1
}
-contains(CONFIG, graphics_surfaces) {
+contains(DEFINES, WTF_USE_GRAPHICS_SURFACE=1) {
mac {
SOURCES += platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp
INCLUDEPATH += /System/Library/Frameworks/CoreFoundation.framework/Headers
Modified: trunk/Tools/ChangeLog (116106 => 116107)
--- trunk/Tools/ChangeLog 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Tools/ChangeLog 2012-05-04 16:09:33 UTC (rev 116107)
@@ -1,3 +1,23 @@
+2012-05-04 Tor Arne Vestbø
+
+[Qt] Clean up and split features.prf into a static list of defaults
+
+The static list of feature defaults is used as a fallback for any
+feature that's not dynamically detected or overriden on the command
+line (though build-webkit or passing DEFINES+= to qmake).
+
+The static list is complete, which allows for auto-generation based
+on Features.py (see bug https://bugs.webkit.org/show_bug.cgi?id=85456)
+
+https://bugs.webkit.org/show_bug.cgi?id=85611
+
+Reviewed by Simon Hausmann.
+
+* Scripts/build-webkit:
+* Tools.pro:
+* qmake/mkspecs/features/features.prf:
+* qmake/mkspecs/features/features.pri: Added.
+
2012-05-04 Sheriff Bot
Unreviewed, rolling out r116085, r116091, and r116095.
Modified: trunk/Tools/Scripts/build-webkit (116106 => 116107)
--- trunk/Tools/Scripts/build-webkit 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Tools/Scripts/build-webkit 2012-05-04 16:09:33 UTC (rev 116107)
@@ -301,12 +301,11 @@
push @options, "DEFINES+=$_->{define}=${$_->{value}}" if $_->{define} && ${$_->{value}} != $_->{default};
}
-if ($minimal) {
-push @options, "CONFIG+=minimal";
-}
-
if ($v8) {
-push @options, "CONFIG+=v8";
+print "Building WebKit2 with v8 is not supported currently. Disabling WebKit2.\n";
+# FIXME: Deal with this in defaults_pre, once Qt has support for getting at the
+# command line arguments at that stage.
+push @options, "CONFIG+=v8 CONFIG+=no_webkit2";
}
}
Modified: trunk/Tools/Tools.pro (116106 => 116107)
--- trunk/Tools/Tools.pro 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Tools/Tools.pro 2012-05-04 16:09:33 UTC (rev 116107)
@@ -33,6 +33,7 @@
qmake/config.tests/gccdepends/* \
qmake/mkspecs/modules/* \
qmake/mkspecs/features/*.prf \
+qmake/mkspecs/features/*.pri \
qmake/mkspecs/features/mac/*.prf \
qmake/mkspecs/features/unix/*.prf \
qmake/mkspecs/features/win32/*.prf
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (116106 => 116107)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 15:43:50 UTC (rev 116106)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 16:09:33 UTC (rev 116107)
@@ -5,27 +5,18 @@
# See 'Tools/qmake/README' for an overview of the build system
# --
[webkit-changes] [116110] trunk/Tools
Title: [116110] trunk/Tools
Revision 116110
Author ves...@webkit.org
Date 2012-05-04 09:32:10 -0700 (Fri, 04 May 2012)
Log Message
[Qt] Clarify warning about missing GLib/Gio/GStreamer for media support
And only print it once.
Reviewed by Csaba Osztrogonác.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (116109 => 116110)
--- trunk/Tools/ChangeLog 2012-05-04 16:25:35 UTC (rev 116109)
+++ trunk/Tools/ChangeLog 2012-05-04 16:32:10 UTC (rev 116110)
@@ -1,5 +1,15 @@
2012-05-04 Tor Arne Vestbø
+[Qt] Clarify warning about missing GLib/Gio/GStreamer for media support
+
+And only print it once.
+
+Reviewed by Csaba Osztrogonác.
+
+* qmake/mkspecs/features/features.prf:
+
+2012-05-04 Tor Arne Vestbø
+
[Qt] Clean up and split features.prf into a static list of defaults
The static list of feature defaults is used as a fallback for any
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (116109 => 116110)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 16:25:35 UTC (rev 116109)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 16:32:10 UTC (rev 116110)
@@ -152,7 +152,7 @@
DEFINES += ENABLE_VIDEO=1
DEFINES += WTF_USE_GSTREAMER=1
} else {
-message("Disabling video due the lack of GLib/Gio/GStreamer.")
+root_project_file: message("Missing GLib/Gio/GStreamer, falling back to QtMultimedia if available")
}
} else: contains(MOBILITY_CONFIG, multimedia) {
DEFINES += ENABLE_VIDEO=1
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [116115] trunk/Tools
Title: [116115] trunk/Tools
Revision 116115
Author ves...@webkit.org
Date 2012-05-04 09:57:23 -0700 (Fri, 04 May 2012)
Log Message
[Qt] Fix up warning about missing GLib/Gio/GStreamer
We don't actually fall back.
Rubber-stamped by Csaba Osztrogonác.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (116114 => 116115)
--- trunk/Tools/ChangeLog 2012-05-04 16:49:39 UTC (rev 116114)
+++ trunk/Tools/ChangeLog 2012-05-04 16:57:23 UTC (rev 116115)
@@ -1,5 +1,15 @@
2012-05-04 Tor Arne Vestbø
+[Qt] Fix up warning about missing GLib/Gio/GStreamer
+
+We don't actually fall back.
+
+Rubber-stamped by Csaba Osztrogonác.
+
+* qmake/mkspecs/features/features.prf:
+
+2012-05-04 Tor Arne Vestbø
+
[Qt] Clarify warning about missing GLib/Gio/GStreamer for media support
And only print it once.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (116114 => 116115)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 16:49:39 UTC (rev 116114)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-04 16:57:23 UTC (rev 116115)
@@ -152,7 +152,7 @@
DEFINES += ENABLE_VIDEO=1
DEFINES += WTF_USE_GSTREAMER=1
} else {
-root_project_file: message("Missing GLib/Gio/GStreamer, falling back to QtMultimedia if available")
+root_project_file: message("Missing GLib/Gio/GStreamer, disabling media element support")
}
} else: contains(MOBILITY_CONFIG, multimedia) {
DEFINES += ENABLE_VIDEO=1
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [116626] trunk
Title: [116626] trunk
Revision 116626
Author ves...@webkit.org
Date 2012-05-10 04:12:25 -0700 (Thu, 10 May 2012)
Log Message
WebPageProxy::activeURL() should return the pending API request, even when there's no main frame
https://bugs.webkit.org/show_bug.cgi?id=85806
The m_pendingAPIRequestURL member is used (presumably) to mask over the async
nature of WebKit2, so that starting a load of a URL will reflect that URL
immedeatly from activeURL, even if the request has not been passed over to
the web process yet and reflected there.
This works well, except in the case of the initial request, where the main
frame creation happens on the web process side and is notified back to the
UI process. Until we've recived the notification we don't know about the main
frame, and this race condition will potentially give us an empty url instead
of the pending request.
To solve this we always return the pending API request if it's set, even
when there's no mainframe yet (that we known about).
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (116625 => 116626)
--- trunk/Source/WebKit2/ChangeLog 2012-05-10 10:56:00 UTC (rev 116625)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-10 11:12:25 UTC (rev 116626)
@@ -1,3 +1,26 @@
+2012-05-07 Tor Arne Vestbø
+
+WebPageProxy::activeURL() should return the pending API request, even when there's no main frame
+https://bugs.webkit.org/show_bug.cgi?id=85806
+
+The m_pendingAPIRequestURL member is used (presumably) to mask over the async
+nature of WebKit2, so that starting a load of a URL will reflect that URL
+immedeatly from activeURL, even if the request has not been passed over to
+the web process yet and reflected there.
+
+This works well, except in the case of the initial request, where the main
+frame creation happens on the web process side and is notified back to the
+UI process. Until we've recived the notification we don't know about the main
+frame, and this race condition will potentially give us an empty url instead
+of the pending request.
+
+To solve this we always return the pending API request if it's set, even
+when there's no mainframe yet (that we known about).
+
+Reviewed by Simon Hausmann.
+
+* UIProcess/WebPageProxy.cpp:
+
2012-05-09 Gyuyoung Kim
Move suspendAnimations to use Internals interface.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (116625 => 116626)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-10 10:56:00 UTC (rev 116625)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-10 11:12:25 UTC (rev 116626)
@@ -660,13 +660,15 @@
String WebPageProxy::activeURL() const
{
+// If there is a currently pending url, it is the active URL,
+// even when there's no main frame yet, as it might be the
+// first API request.
+if (!m_pendingAPIRequestURL.isNull())
+return m_pendingAPIRequestURL;
+
if (!m_mainFrame)
return String();
-// If there is a currently pending url, it is the active URL.
-if (!m_pendingAPIRequestURL.isNull())
-return m_pendingAPIRequestURL;
-
if (!m_mainFrame->unreachableURL().isEmpty())
return m_mainFrame->unreachableURL();
Modified: trunk/Tools/ChangeLog (116625 => 116626)
--- trunk/Tools/ChangeLog 2012-05-10 10:56:00 UTC (rev 116625)
+++ trunk/Tools/ChangeLog 2012-05-10 11:12:25 UTC (rev 116626)
@@ -1,3 +1,26 @@
+2012-05-07 Tor Arne Vestbø
+
+WebPageProxy::activeURL() should return the pending API request, even when there's no main frame
+https://bugs.webkit.org/show_bug.cgi?id=85806
+
+The m_pendingAPIRequestURL member is used (presumably) to mask over the async
+nature of WebKit2, so that starting a load of a URL will reflect that URL
+immedeatly from activeURL, even if the request has not been passed over to
+the web process yet and reflected there.
+
+This works well, except in the case of the initial request, where the main
+frame creation happens on the web process side and is notified back to the
+UI process. Until we've recived the notification we don't know about the main
+frame, and this race condition will potentially give us an empty url instead
+of the pending request.
+
+To solve this we always return the pending API request if it's set, even
+when there's no mainframe yet (that we known about).
+
+Reviewed by Simon Hausmann.
+
+* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+
2012-05-10 Mikhail Pozdnyakov
[EFL][DRT] Clear added user style sheets before a new testcase execution.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/P
[webkit-changes] [116631] trunk/Source/WebKit/qt
Title: [116631] trunk/Source/WebKit/qt Revision 116631 Author ves...@webkit.org Date 2012-05-10 05:09:30 -0700 (Thu, 10 May 2012) Log Message [Qt] Fix \sa usage in documentation Ensure comma between elements (6 missing). Patch by Marius Storm-Olsen on 2012-05-10 Reviewed by Tor Arne Vestbø. Modified Paths trunk/Source/WebKit/qt/Api/qwebpage.cpp trunk/Source/WebKit/qt/ChangeLog Diff Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (116630 => 116631) --- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-05-10 11:56:35 UTC (rev 116630) +++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-05-10 12:09:30 UTC (rev 116631) @@ -3407,7 +3407,7 @@ \inmodule QtWebKit -\sa QWebPage::extension() QWebPage::ExtensionReturn +\sa QWebPage::extension(), QWebPage::ExtensionReturn */ @@ -3418,7 +3418,7 @@ \inmodule QtWebKit -\sa QWebPage::extension() QWebPage::ExtensionOption +\sa QWebPage::extension(), QWebPage::ExtensionOption */ /*! @@ -3434,7 +3434,7 @@ The error itself is reported by an error \a domain, the \a error code as well as \a errorString. -\sa QWebPage::extension() QWebPage::ErrorPageExtensionReturn +\sa QWebPage::extension(), QWebPage::ErrorPageExtensionReturn */ /*! @@ -3481,7 +3481,7 @@ External objects such as stylesheets or images referenced in the HTML are located relative to \a baseUrl. -\sa QWebPage::extension() QWebPage::ErrorPageExtensionOption, QString::toUtf8() +\sa QWebPage::extension(), QWebPage::ErrorPageExtensionOption, QString::toUtf8() */ /*! @@ -3524,7 +3524,7 @@ The ChooseMultipleFilesExtensionOption class holds the frame originating the request and the suggested filenames which might be provided. -\sa QWebPage::extension() QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn +\sa QWebPage::extension(), QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn */ /*! @@ -3553,7 +3553,7 @@ The ChooseMultipleFilesExtensionReturn class holds the filenames selected by the user when the extension is invoked. -\sa QWebPage::extension() QWebPage::ChooseMultipleFilesExtensionOption +\sa QWebPage::extension(), QWebPage::ChooseMultipleFilesExtensionOption */ /*! Modified: trunk/Source/WebKit/qt/ChangeLog (116630 => 116631) --- trunk/Source/WebKit/qt/ChangeLog 2012-05-10 11:56:35 UTC (rev 116630) +++ trunk/Source/WebKit/qt/ChangeLog 2012-05-10 12:09:30 UTC (rev 116631) @@ -1,3 +1,13 @@ +2012-05-10 Marius Storm-Olsen + +[Qt] Fix \sa usage in documentation + +Ensure comma between elements (6 missing). + +Reviewed by Tor Arne Vestbø. + +* Api/qwebpage.cpp: + 2012-05-09 Gyuyoung Kim Move suspendAnimations to use Internals interface. ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [116958] trunk/Source/WebKit2
Title: [116958] trunk/Source/WebKit2
Revision 116958
Author ves...@webkit.org
Date 2012-05-14 09:44:19 -0700 (Mon, 14 May 2012)
Log Message
[Qt] Simplify OTHER_FILES for QML tests project files
Reviewed by Jocelyn Turcotte.
* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
* UIProcess/API/qt/tests/qmltests/WebView.pro:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro
Diff
Modified: trunk/Source/WebKit2/ChangeLog (116957 => 116958)
--- trunk/Source/WebKit2/ChangeLog 2012-05-14 16:34:15 UTC (rev 116957)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-14 16:44:19 UTC (rev 116958)
@@ -1,3 +1,12 @@
+2012-05-14 Tor Arne Vestbø
+
+[Qt] Simplify OTHER_FILES for QML tests project files
+
+Reviewed by Jocelyn Turcotte.
+
+* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
+* UIProcess/API/qt/tests/qmltests/WebView.pro:
+
2012-05-14 Carlos Garcia Campos
Unreviewed. Fix make distcheck.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro (116957 => 116958)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-05-14 16:34:15 UTC (rev 116957)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-05-14 16:44:19 UTC (rev 116958)
@@ -15,10 +15,5 @@
DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
OTHER_FILES += \
-DesktopBehavior/DesktopWebView.qml \
-DesktopBehavior/tst_linkHovered.qml \
-DesktopBehavior/tst_loadHtml.qml \
-DesktopBehavior/tst_messaging.qml \
-DesktopBehavior/tst_navigationRequested.qml \
-DesktopBehavior/tst_singleFileupload.qml \
-DesktopBehavior/tst_multiFileupload.qml
+DesktopBehavior/*
+common/*
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro (116957 => 116958)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-05-14 16:34:15 UTC (rev 116957)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-05-14 16:44:19 UTC (rev 116958)
@@ -14,18 +14,5 @@
DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
OTHER_FILES += \
-WebView/tst_favIconLoad.qml \
-WebView/tst_download.qml \
-WebView/tst_geopermission.qml \
-WebView/tst_itemSelector.qml \
-WebView/tst_javaScriptDialogs.qml \
-WebView/tst_loadFail.qml \
-WebView/tst_loadIgnore.qml \
-WebView/tst_loadHtml.qml \
-WebView/tst_loadProgress.qml \
-WebView/tst_loadProgressSignal.qml \
-WebView/tst_preferences.qml \
-WebView/tst_properties.qml \
-WebView/tst_titleChanged.qml \
-WebView/tst_applicationScheme.qml \
-WebView/tst_origin.qml
+WebView/* \
+common/*
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [117049] trunk/Tools
Title: [117049] trunk/Tools
Revision 117049
Author ves...@webkit.org
Date 2012-05-15 03:16:35 -0700 (Tue, 15 May 2012)
Log Message
Teach webkit-patch to gracefully handle writes of raw utf-8 encoded strings to sys.stdout
https://bugs.webkit.org/show_bug.cgi?id=85809
webkit-patch overrides sys.stdout with a StreamWriter that ensures we write utf8
output to stdout, but StreamWriter will by default always encode the object that's
passed to write(). This blows up when the object is a raw string, already encoded
as utf8, and does not match the default behavior of sys.stdout.
To solve this in one place, instead of every single call-site that might write
raw strings, we extend the stdout-wrapper to assume raw strings are utf8 before
passing them on to StreamWriter.write(). This has the benefit of also making the
stacktrace easy to read in the case where this assumption does not hold.
The source of this particular bug was that Executive.run_and_throw_if_fail() will
tee the output of the subprocess, and in the case of running prepare-ChangeLog this
might produce non-ascii output, which gets written directly to sys.stdout as raw
utf8-encoded strings.
Reviewed by Dirk Pranke.
* Scripts/webkit-patch:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkit-patch
Diff
Modified: trunk/Tools/ChangeLog (117048 => 117049)
--- trunk/Tools/ChangeLog 2012-05-15 10:09:31 UTC (rev 117048)
+++ trunk/Tools/ChangeLog 2012-05-15 10:16:35 UTC (rev 117049)
@@ -1,3 +1,28 @@
+2012-05-15 Tor Arne Vestbø
+
+Teach webkit-patch to gracefully handle writes of raw utf-8 encoded strings to sys.stdout
+
+https://bugs.webkit.org/show_bug.cgi?id=85809
+
+webkit-patch overrides sys.stdout with a StreamWriter that ensures we write utf8
+output to stdout, but StreamWriter will by default always encode the object that's
+passed to write(). This blows up when the object is a raw string, already encoded
+as utf8, and does not match the default behavior of sys.stdout.
+
+To solve this in one place, instead of every single call-site that might write
+raw strings, we extend the stdout-wrapper to assume raw strings are utf8 before
+passing them on to StreamWriter.write(). This has the benefit of also making the
+stacktrace easy to read in the case where this assumption does not hold.
+
+The source of this particular bug was that Executive.run_and_throw_if_fail() will
+tee the output of the subprocess, and in the case of running prepare-ChangeLog this
+might produce non-ascii output, which gets written directly to sys.stdout as raw
+utf8-encoded strings.
+
+Reviewed by Dirk Pranke.
+
+* Scripts/webkit-patch:
+
2012-05-15 Tomasz Morawski
[EFL][DRT] Split ewk_private.h file to multiple private files.
Modified: trunk/Tools/Scripts/webkit-patch (117048 => 117049)
--- trunk/Tools/Scripts/webkit-patch 2012-05-15 10:09:31 UTC (rev 117048)
+++ trunk/Tools/Scripts/webkit-patch 2012-05-15 10:16:35 UTC (rev 117049)
@@ -43,13 +43,28 @@
from webkitpy.common.system.logutils import configure_logging
from webkitpy.tool.main import WebKitPatch
+# A StreamWriter will by default try to encode all objects passed
+# to write(), so when passed a raw string already encoded as utf8,
+# it will blow up with an UnicodeDecodeError. This does not match
+# the default behaviour of writing to sys.stdout, so we intercept
+# the case of writing raw strings and make sure StreamWriter gets
+# input that it can handle.
+class ForgivingUTF8Writer(codecs.lookup('utf-8')[-1]):
+def write(self, object):
+if isinstance(object, str):
+# Assume raw strings are utf-8 encoded. If this line
+# fails with an UnicodeDecodeError, our assumption was
+# wrong, and the stacktrace should show you where we
+# write non-Unicode/UTF-8 data (which we shouldn't).
+object = object.decode('utf-8')
+return codecs.StreamWriter.write(self, object)
+
# By default, sys.stdout assumes ascii encoding. Since our messages can
# contain unicode strings (as with some peoples' names) we need to apply
# the utf-8 codec to prevent throwing and exception.
# Not having this was the cause of https://bugs.webkit.org/show_bug.cgi?id=63452.
-sys.stdout = codecs.lookup('utf-8')[-1](sys.stdout)
+sys.stdout = ForgivingUTF8Writer(sys.stdout)
-
_log = logging.getLogger("webkit-patch")
def main():
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112132] trunk/Source/WebKit2
Title: [112132] trunk/Source/WebKit2 Revision 112132 Author ves...@webkit.org Date 2012-03-26 11:39:08 -0700 (Mon, 26 Mar 2012) Log Message [Qt][WK2] default families are not set in QWebPreferences https://bugs.webkit.org/show_bug.cgi?id=81933 This is a build-fix after r112116. Patch by Rafael Brandao on 2012-03-26 Reviewed by Tor Arne Vestbø. * UIProcess/API/qt/qwebpreferences_p_p.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h Diff Modified: trunk/Source/WebKit2/ChangeLog (112131 => 112132) --- trunk/Source/WebKit2/ChangeLog 2012-03-26 18:26:54 UTC (rev 112131) +++ trunk/Source/WebKit2/ChangeLog 2012-03-26 18:39:08 UTC (rev 112132) @@ -1,3 +1,14 @@ +2012-03-26 Rafael Brandao + +[Qt][WK2] default families are not set in QWebPreferences +https://bugs.webkit.org/show_bug.cgi?id=81933 + +This is a build-fix after r112116. + +Reviewed by Tor Arne Vestbø. + +* UIProcess/API/qt/qwebpreferences_p_p.h: + 2012-03-26 Pierre Rossi [Qt][WK2] default families are not set in QWebPreferences Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h (112131 => 112132) --- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-03-26 18:26:54 UTC (rev 112131) +++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-03-26 18:39:08 UTC (rev 112132) @@ -59,7 +59,7 @@ void setAttribute(WebAttribute attr, bool enable); bool testAttribute(WebAttribute attr) const; -void initFontDefaults(); +void initializeDefaultFontSettings(); void setFontFamily(FontFamily which, const QString& family); QString fontFamily(FontFamily which) const; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [124597] trunk/Source/WebCore
Title: [124597] trunk/Source/WebCore
Revision 124597
Author ves...@webkit.org
Date 2012-08-03 04:53:53 -0700 (Fri, 03 Aug 2012)
Log Message
Add missing include to build on Mac OS 10.8
Reviewed by Ossy.
* platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (124596 => 124597)
--- trunk/Source/WebCore/ChangeLog 2012-08-03 11:51:58 UTC (rev 124596)
+++ trunk/Source/WebCore/ChangeLog 2012-08-03 11:53:53 UTC (rev 124597)
@@ -1,3 +1,11 @@
+2012-08-03 Tor Arne Vestbø
+
+Add missing include to build on Mac OS 10.8
+
+Reviewed by Ossy.
+
+* platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:
+
2012-08-03 Adam Barth
[V8] Re-wire "target" half of the same-origin security check through Document rather than DOMWindow
Modified: trunk/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp (124596 => 124597)
--- trunk/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp 2012-08-03 11:51:58 UTC (rev 124596)
+++ trunk/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp 2012-08-03 11:53:53 UTC (rev 124597)
@@ -26,8 +26,8 @@
#include
#include
#include
+#include
-
namespace WebCore {
struct GraphicsSurfacePrivate { };
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [124601] trunk/Tools
Title: [124601] trunk/Tools
Revision 124601
Author ves...@webkit.org
Date 2012-08-03 05:54:23 -0700 (Fri, 03 Aug 2012)
Log Message
[Qt] Always save CONFIG & DEFINES in default_pre
Always doing it is cheaper than checking whether it needs to be done.
apart from that, it would break configuration initiated from another
project.
Patch by Oswald Buddenhagen on 2012-08-03
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf
Diff
Modified: trunk/Tools/ChangeLog (124600 => 124601)
--- trunk/Tools/ChangeLog 2012-08-03 12:25:16 UTC (rev 124600)
+++ trunk/Tools/ChangeLog 2012-08-03 12:54:23 UTC (rev 124601)
@@ -1,3 +1,15 @@
+2012-08-03 Oswald Buddenhagen
+
+[Qt] Always save CONFIG & DEFINES in default_pre
+
+Always doing it is cheaper than checking whether it needs to be done.
+apart from that, it would break configuration initiated from another
+project.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/default_pre.prf:
+
2012-08-03 Joone Hur
[EFL][DRT] fast/loader/stop-provisional-loads.html fails
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (124600 => 124601)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 12:25:16 UTC (rev 124600)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 12:54:23 UTC (rev 124601)
@@ -27,10 +27,6 @@
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
-# Detect if we're running the initial configure step
-pro_file_name = $$basename(_PRO_FILE_)
-equals(pro_file_name, configure.pro): CONFIG += configure_pass
-
# We want the QtWebKit API forwarding includes to live in the root build dir.
MODULE_BASE_DIR = $$ROOT_WEBKIT_DIR
MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
@@ -143,9 +139,7 @@
FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
}
-configure_pass {
-# Save the base config and defines so we can compute the delta between
-# what features.prf introduced and what was already there.
-BASE_CONFIG = $$CONFIG
-BASE_DEFINES = $$DEFINES
-}
+# Save the base config and defines so we can compute the delta between
+# what features.prf introduced and what was already there.
+BASE_CONFIG = $$CONFIG
+BASE_DEFINES = $$DEFINES
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [124607] trunk/Tools
Title: [124607] trunk/Tools
Revision 124607
Author ves...@webkit.org
Date 2012-08-03 07:10:27 -0700 (Fri, 03 Aug 2012)
Log Message
[Qt] Move build config default to build-webkit instead of default_pre
Allows the qmake buildsystem have its own default.
Patch by Oswald Buddenhagen on 2012-08-03
Reviewed by Tor Arne Vestbø.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/qmake/mkspecs/features/default_pre.prf
Diff
Modified: trunk/Tools/ChangeLog (124606 => 124607)
--- trunk/Tools/ChangeLog 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
@@ -1,3 +1,15 @@
+2012-08-03 Oswald Buddenhagen
+
+[Qt] Move build config default to build-webkit instead of default_pre
+
+Allows the qmake buildsystem have its own default.
+
+Reviewed by Tor Arne Vestbø.
+
+* Scripts/webkitdirs.pm:
+(buildQMakeProjects):
+* qmake/mkspecs/features/default_pre.prf:
+
2012-08-03 Mario Sanchez Prada
Unreviewed build fix for GTK after r124581.
Modified: trunk/Tools/Scripts/webkitdirs.pm (124606 => 124607)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 14:10:27 UTC (rev 124607)
@@ -2311,10 +2311,10 @@
if ($passedConfig =~ m/debug/i) {
push @buildArgs, "CONFIG-=release";
push @buildArgs, "CONFIG+=debug";
-} elsif ($passedConfig =~ m/release/i) {
+} elsif (!$passedConfig or $passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
-} elsif ($passedConfig) {
+} else {
die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (124606 => 124607)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 14:10:27 UTC (rev 124607)
@@ -16,12 +16,6 @@
pro_file = $$_PRO_FILE_ # Checking the variable directly does not work
isEmpty(pro_file): CONFIG += recursive_include
-# We default to release builds
-!build_pass {
-CONFIG += release
-CONFIG -= debug
-}
-
# Resolve root directories for source and build
ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,)
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [124608] trunk
Title: [124608] trunk
Revision 124608
Author ves...@webkit.org
Date 2012-08-03 07:11:03 -0700 (Fri, 03 Aug 2012)
Log Message
[Qt] Populate .qmake.cache from the top-level project file
This makes it possible to build webkit without using the perl build
script. The duplicated logic in build-webkit will be removed when we
remove the Qt4 code paths. The build-webkit script will then simply
call 'qmake WebKit.pro' from WEBKITOUTPUTDIR.
Patch by Oswald Buddenhagen on 2012-08-03
Reviewed by Tor Arne Vestbø.
Modified Paths
trunk/ChangeLog
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf
trunk/WebKit.pro
Diff
Modified: trunk/ChangeLog (124607 => 124608)
--- trunk/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/ChangeLog 2012-08-03 14:11:03 UTC (rev 124608)
@@ -1,3 +1,16 @@
+2012-08-03 Oswald Buddenhagen
+
+[Qt] Populate .qmake.cache from the top-level project file
+
+This makes it possible to build webkit without using the perl build
+script. The duplicated logic in build-webkit will be removed when we
+remove the Qt4 code paths. The build-webkit script will then simply
+call 'qmake WebKit.pro' from WEBKITOUTPUTDIR.
+
+Reviewed by Tor Arne Vestbø.
+
+* WebKit.pro:
+
2012-08-03 Dominik Röttsches
[cmake] Cleanup FindHarfBuzz.cmake
Modified: trunk/Tools/ChangeLog (124607 => 124608)
--- trunk/Tools/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/Tools/ChangeLog 2012-08-03 14:11:03 UTC (rev 124608)
@@ -1,5 +1,18 @@
2012-08-03 Oswald Buddenhagen
+[Qt] Populate .qmake.cache from the top-level project file
+
+This makes it possible to build webkit without using the perl build
+script. The duplicated logic in build-webkit will be removed when we
+remove the Qt4 code paths. The build-webkit script will then simply
+call 'qmake WebKit.pro' from WEBKITOUTPUTDIR.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/win32/default_pre.prf:
+
+2012-08-03 Oswald Buddenhagen
+
[Qt] Move build config default to build-webkit instead of default_pre
Allows the qmake buildsystem have its own default.
Modified: trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf (124607 => 124608)
--- trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-08-03 14:11:03 UTC (rev 124608)
@@ -7,3 +7,6 @@
load(default_pre)
debug: CONFIG += use_all_in_one_files
+
+# WebKit2 not supported on Windows yet
+CONFIG += no_webkit2
Modified: trunk/WebKit.pro (124607 => 124608)
--- trunk/WebKit.pro 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/WebKit.pro 2012-08-03 14:11:03 UTC (rev 124608)
@@ -11,6 +11,38 @@
error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
# Otherwise we won't pick up the feature prf files needed for the build
}
+} else:!webkit_configured {
+CONFIG += webkit_configured
+CONFIG += production_build
+include(Tools/qmake/configure.pri)
+the_config = $$CONFIG
+the_config -= $$BASE_CONFIG $$find(CONFIG, "^(done_)?config_")
+cache(CONFIG, add, the_config)
+the_defines = $$DEFINES
+the_defines -= $$BASE_DEFINES
+cache(DEFINES, add, the_defines)
+
+# We inherit the build type from Qt, unless it was specified on the qmake command
+# line. Note that the perl build script defaults to forcing a release build.
+contains(the_config, debug|release) {
+contains(the_config, debug) {
+contains(the_config, release) {
+!debug_and_release:cache(CONFIG, add, $$list(debug_and_release))
+} else {
+release:cache(CONFIG, del, $$list(release))
+debug_and_release:cache(CONFIG, del, $$list(debug_and_release))
+}
+} else { # release
+debug:cache(CONFIG, del, $$list(debug))
+debug_and_release:cache(CONFIG, del, $$list(debug_and_release))
+}
+} else {
+contains(QT_CONFIG, release, debug|release): \
+cache(CONFIG, add, $$list(release))
+else: \
+cache(CONFIG, add, $$list(debug))
+macx:!debug_and_release:cache(CONFIG, add, $$list(debug_and_release))
+}
}
TEMPLATE = subdirs
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [114106] trunk/Source/WebKit/qt
Title: [114106] trunk/Source/WebKit/qt
Revision 114106
Author ves...@webkit.org
Date 2012-04-13 03:37:51 -0700 (Fri, 13 Apr 2012)
Log Message
[Qt] Fix build on OS X
We were manually including the directories needed from WTF, instead of
using the WEBKIT qmake variable to add dependencies, which also adds
other tricks from WTF.pri, such as the right include paths for ICU.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/declarative/experimental/experimental.pri
trunk/Source/WebKit/qt/declarative/public.pri
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (114105 => 114106)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-13 10:37:51 UTC (rev 114106)
@@ -1,3 +1,16 @@
+2012-04-13 Tor Arne Vestbø
+
+[Qt] Fix build on OS X
+
+We were manually including the directories needed from WTF, instead of
+using the WEBKIT qmake variable to add dependencies, which also adds
+other tricks from WTF.pri, such as the right include paths for ICU.
+
+Reviewed by Simon Hausmann.
+
+* declarative/experimental/experimental.pri:
+* declarative/public.pri:
+
2012-04-12 Balazs Kelemen
[Qt] Fix WebKit1 build with V8
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (114105 => 114106)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-04-13 10:37:51 UTC (rev 114106)
@@ -35,16 +35,7 @@
DEFINES += HAVE_WEBKIT2
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
-../../../../WebKit2/Shared/qt \
-../../../../_javascript_Core \
-../../../../_javascript_Core/wtf \
-../../../../_javascript_Core/wtf/unicode \
-../../../../_javascript_Core/runtime \
-../../../../WebKit2/Platform \
-../../../../WebKit2/Platform/CoreIPC \
-../../../../WTF
+WEBKIT += wtf _javascript_core webkit2
target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
Modified: trunk/Source/WebKit/qt/declarative/public.pri (114105 => 114106)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-04-13 10:37:51 UTC (rev 114106)
@@ -39,14 +39,6 @@
CONFIG += rpath
RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
-../../../WebKit2/Shared/qt \
-../../../_javascript_Core \
-../../../_javascript_Core/runtime \
-../../../_javascript_Core/wtf \
-../../../WTF
-
SOURCES += plugin.cpp
!no_webkit2: {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [114110] trunk/Source/WebKit/qt
Title: [114110] trunk/Source/WebKit/qt
Revision 114110
Author ves...@webkit.org
Date 2012-04-13 04:16:34 -0700 (Fri, 13 Apr 2012)
Log Message
[Qt] Build fix with QT_NO_BEARERMANAGEMENT
Reviewed by Jocelyn Turcotte.
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp
trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (114109 => 114110)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-13 11:16:34 UTC (rev 114110)
@@ -1,5 +1,18 @@
2012-04-13 Tor Arne Vestbø
+[Qt] Build fix with QT_NO_BEARERMANAGEMENT
+
+Reviewed by Jocelyn Turcotte.
+
+* tests/benchmarks/loading/tst_loading.cpp:
+(tst_Loading):
+(tst_Loading::load):
+* tests/benchmarks/painting/tst_painting.cpp:
+(tst_Painting):
+(tst_Painting::paint):
+
+2012-04-13 Tor Arne Vestbø
+
[Qt] Fix build on OS X
We were manually including the directories needed from WTF, instead of
Modified: trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp (114109 => 114110)
--- trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp 2012-04-13 11:16:34 UTC (rev 114110)
@@ -17,7 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef QT_NO_BEARERMANAGEMENT
#include
+#endif
#include
@@ -42,7 +44,9 @@
void load();
private:
+#ifndef QT_NO_BEARERMANAGEMENT
QNetworkConfigurationManager m_manager;
+#endif
QWebView* m_view;
QWebPage* m_page;
};
@@ -74,8 +78,10 @@
{
QFETCH(QUrl, url);
+#ifndef QT_NO_BEARERMANAGEMENT
if (!m_manager.isOnline())
W_QSKIP("This test requires an active network connection", SkipSingle);
+#endif
QBENCHMARK {
m_view->load(url);
Modified: trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp (114109 => 114110)
--- trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp 2012-04-13 11:16:34 UTC (rev 114110)
@@ -17,7 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef QT_NO_BEARERMANAGEMENT
#include
+#endif
#include
@@ -44,7 +46,9 @@
void textAreas();
private:
+#ifndef QT_NO_BEARERMANAGEMENT
QNetworkConfigurationManager m_manager;
+#endif
QWebView* m_view;
QWebPage* m_page;
};
@@ -74,8 +78,10 @@
{
QFETCH(QUrl, url);
+#ifndef QT_NO_BEARERMANAGEMENT
if (!m_manager.isOnline())
W_QSKIP("This test requires an active network connection", SkipSingle);
+#endif
m_view->load(url);
::waitForSignal(m_view, SIGNAL(loadFinished(bool)), 0);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [115191] trunk
Title: [115191] trunk Revision 115191 Author ves...@webkit.org Date 2012-04-25 06:29:00 -0700 (Wed, 25 Apr 2012) Log Message [Qt] Make the web view's url property follow the active url https://bugs.webkit.org/show_bug.cgi?id=77554 The url property of the webview now reflects the 'active' url of the page, which maps to either the currently loading url, in the case of an ongoing load, or the result of a load, even when the load failed. In practice this means that setting the url though QML, or navigating to a new url in the page by e.g clicking, will both instantly change the url-property of the webview to the target url. This differs from earlier behavior, where we would update the url when the load committed. An optional argument is added to loadHtml(), to allow setting the unreachable url when providing replacement content for failed loads. A slight change in the activeUrl() implementation is also done, where we now favour the url of an pending API request, even when we don't have a mainframe yet. Finally, the location bar in the minibrowser is updated to behave a bit more like normal browsers in terms of when the url will change and how active focus is handled. Reviewed by Simon Hausmann. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.h trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp Added Paths trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html Diff Modified: trunk/Source/WebKit2/ChangeLog (115190 => 115191) --- trunk/Source/WebKit2/ChangeLog 2012-04-25 13:15:06 UTC (rev 115190) +++ trunk/Source/WebKit2/ChangeLog 2012-04-25 13:29:00 UTC (rev 115191) @@ -1,3 +1,58 @@ +2012-04-18 Tor Arne Vestbø + +[Qt] Make the web view's url property follow the active url + +https://bugs.webkit.org/show_bug.cgi?id=77554 + +The url property of the webview now reflects the 'active' url of the +page, which maps to either the currently loading url, in the case of +an ongoing load, or the result of a load, even when the load failed. + +In practice this means that setting the url though QML, or navigating +to a new url in the page by e.g clicking, will both instantly change +the url-property of the webview to the target url. This differs from +earlier behavior, where we would update the url when the load +committed. + +An optional argument is added to loadHtml(), to allow setting +the unreachable url when providing replacement content for failed +loads. + +A slight change in the activeUrl() implementation is also done, +where we now favour the url of an pending API request, even when +we don't have a mainframe yet. + +Finally, the location bar in the minibrowser is updated to behave +a bit more like normal browsers in terms of when the url will change +and how active focus is handled. + +Reviewed by Simon Hausmann. + +* UIProcess/API/qt/qquickwebview.cpp: +(QQuickWebViewPrivate::onComponentComplete): +(QQuickWebView::reload): +(QQuickWebView::url): +(QQuickWebView::setUrl): +(QQuickWebView::loadHtml): +* UIProcess/API/qt/qquickwebview_p.h: +* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro: +* UIProcess/API/qt/tests/qmltests/WebView.pro: +* UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml: +* UIProcess/API/qt/tests/qmltests/common/link.html: Added. +* UIProcess/API/qt/tests/qmltests/common/redirect.html: Added. +* UIProcess/WebPageProxy.cpp: +(WebKit::WebPageProxy::activeURL): +* UIProcess/qt/QtWebPageLoadClient.cpp: +(QtWebPageLoadClient::QtWebPageLoadClient): +(QtWebPageLoadClient::didStartProvisionalLoadForFrame): +(QtWebPageLoadClient::didReceiveServerRedirectForProvisionalLoadForFrame): +(QtWebPageLoadClient::didCommitLoadForFrame): +(QtWebPageLoadClient::dispatchLoadFailed): +(QtWebPageLoadClient::didFailProvisionalLoadWithErrorForFrame): +(QtWebPageLoadClient::didFailLoadWithErrorForFrame): +* UIProcess/qt/QtWebPageLoadClient.h: +(QtWebPageLoadClient): + 20
[webkit-changes] [115841] trunk/Source/WebKit2
Title: [115841] trunk/Source/WebKit2
Revision 115841
Author ves...@webkit.org
Date 2012-05-02 09:15:24 -0700 (Wed, 02 May 2012)
Log Message
Make ShareableSurface's ref-counting thread-safe
Fixes assert when threaded rendering is enabled for the Qt scene-graph.
https://bugs.webkit.org/show_bug.cgi?id=85381
Reviewed by Noam Rosenthal.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ShareableSurface.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115840 => 115841)
--- trunk/Source/WebKit2/ChangeLog 2012-05-02 15:49:20 UTC (rev 115840)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-02 16:15:24 UTC (rev 115841)
@@ -1,3 +1,15 @@
+2012-05-02 Tor Arne Vestbø
+
+Make ShareableSurface's ref-counting thread-safe
+
+Fixes assert when threaded rendering is enabled for the Qt scene-graph.
+
+https://bugs.webkit.org/show_bug.cgi?id=85381
+
+Reviewed by Noam Rosenthal.
+
+* Shared/ShareableSurface.h:
+
2012-05-02 No'am Rosenthal
[Texmap] Enable css filters in TextureMapperGL
Modified: trunk/Source/WebKit2/Shared/ShareableSurface.h (115840 => 115841)
--- trunk/Source/WebKit2/Shared/ShareableSurface.h 2012-05-02 15:49:20 UTC (rev 115840)
+++ trunk/Source/WebKit2/Shared/ShareableSurface.h 2012-05-02 16:15:24 UTC (rev 115841)
@@ -22,6 +22,8 @@
#include "ShareableBitmap.h"
+#include
+
#if USE(GRAPHICS_SURFACE)
#include "GraphicsSurface.h"
#endif
@@ -34,7 +36,7 @@
namespace WebKit {
-class ShareableSurface : public RefCounted {
+class ShareableSurface : public ThreadSafeRefCounted {
public:
enum Hint {
SupportsGraphicsSurface = 0x01
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [115862] trunk
Title: [115862] trunk
Revision 115862
Author ves...@webkit.org
Date 2012-05-02 12:19:24 -0700 (Wed, 02 May 2012)
Log Message
Revert r115191 - "Make the web view's url property follow the active url"
It uncovered/caused issues in the icon-implementation that can't be
easily fixed, so rolling out instead.
https://bugs.webkit.org/show_bug.cgi?id=77554
Rubber-stamped by Simon Hausmann.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
Removed Paths
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115861 => 115862)
--- trunk/Source/WebKit2/ChangeLog 2012-05-02 19:18:28 UTC (rev 115861)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-02 19:19:24 UTC (rev 115862)
@@ -1,3 +1,41 @@
+2012-05-02 Tor Arne Vestbø
+
+Revert r115191 - "Make the web view's url property follow the active url"
+
+It uncovered/caused issues in the icon-implementation that can't be
+easily fixed, so rolling out instead.
+
+https://bugs.webkit.org/show_bug.cgi?id=77554
+
+Rubber-stamped by Simon Hausmann.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::onComponentComplete):
+(QQuickWebView::reload):
+(QQuickWebView::url):
+(QQuickWebView::setUrl):
+(QQuickWebView::loadHtml):
+* UIProcess/API/qt/qquickwebview_p.h:
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+* UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp:
+* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
+* UIProcess/API/qt/tests/qmltests/WebView.pro:
+* UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml:
+* UIProcess/API/qt/tests/qmltests/common/link.html: Removed.
+* UIProcess/API/qt/tests/qmltests/common/redirect.html: Removed.
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::activeURL):
+* UIProcess/qt/QtWebPageLoadClient.cpp:
+(WebKit::QtWebPageLoadClient::QtWebPageLoadClient):
+(WebKit::QtWebPageLoadClient::didCommitLoad):
+(WebKit::QtWebPageLoadClient::didSameDocumentNavigation):
+(WebKit::QtWebPageLoadClient::dispatchLoadFailed):
+(WebKit::QtWebPageLoadClient::didFailProvisionalLoadWithErrorForFrame):
+(WebKit::QtWebPageLoadClient::didFailLoadWithErrorForFrame):
+* UIProcess/qt/QtWebPageLoadClient.h:
+(QtWebPageLoadClient):
+
2012-05-02 Anders Carlsson
When viewing a PDF, the Safari Status Bar shows other text
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (115861 => 115862)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-02 19:18:28 UTC (rev 115861)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-02 19:19:24 UTC (rev 115862)
@@ -50,12 +50,9 @@
#include <_javascript_Core/InitializeThreading.h>
#include
-#include
-#include
-#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -237,11 +234,10 @@
void QQuickWebViewPrivate::onComponentComplete()
{
-if (m_deferredUrlToLoad.isEmpty())
+if (m_deferedUrlToLoad.isEmpty())
return;
-q_ptr->setUrl(m_deferredUrlToLoad);
-m_deferredUrlToLoad.clear();
+q_ptr->setUrl(m_deferedUrlToLoad);
}
void QQuickWebViewPrivate::setNeedsDisplay()
@@ -1265,17 +1261,6 @@
void QQuickWebView::reload()
{
Q_D(QQuickWebView);
-
-WebFrameProxy* mainFrame = d->webPageProxy->mainFrame();
-if (mainFrame && !mainFrame->unreachableURL().isEmpty() && mainFrame->url() != blankURL()) {
-// We have an unreachable url, but haven't loaded alternative content
-// for it (an error page eg.), so WebCore doesn't know about the unreachable
-// url, and will try to reload the currently committed url instead. We don't
-// want that, so we override the reload here by doing a manual load.
-d->webPageProxy->loadURL(mainFrame->unreachableURL());
-return;
-}
-
const bool reloadFromOrigin = true;
d->webPageProxy->reload(reloadFromOrigin);
}
@@ -1283,12 +1268,10 @@
QUr
[webkit-changes] [115958] trunk
Title: [115958] trunk
Revision 115958
Author ves...@webkit.org
Date 2012-05-03 04:14:20 -0700 (Thu, 03 May 2012)
Log Message
[Qt] Allow the web process and WTR to be paused on startup
Makes it easier to debug the web process or run-webkit-tests -2, as you
have ample time to attach gdb to the process.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
trunk/Source/WebKit2/qt/MainQt.cpp
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py
trunk/Tools/WebKitTestRunner/qt/main.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115957 => 115958)
--- trunk/Source/WebKit2/ChangeLog 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-03 11:14:20 UTC (rev 115958)
@@ -1,3 +1,17 @@
+2012-05-03 Tor Arne Vestbø
+
+[Qt] Allow the web process and WTR to be paused on startup
+
+Makes it easier to debug the web process or run-webkit-tests -2, as you
+have ample time to attach gdb to the process.
+
+Reviewed by Simon Hausmann.
+
+* WebProcess/qt/WebProcessMainQt.cpp:
+(WebKit::WebProcessMainQt):
+* qt/MainQt.cpp:
+(main):
+
2012-05-03 Alexander Færøy
Rename deviceDPI to devicePixelRatio
Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp (115957 => 115958)
--- trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2012-05-03 11:14:20 UTC (rev 115958)
@@ -141,13 +141,6 @@
Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app)
{
-#ifndef NDEBUG
-if (qgetenv("QT_WEBKIT2_DEBUG") == "1") {
-qDebug() << "Waiting 3 seconds for debugger";
-sleep(3);
-}
-#endif
-
initializeProxy();
srandom(time(0));
Modified: trunk/Source/WebKit2/qt/MainQt.cpp (115957 => 115958)
--- trunk/Source/WebKit2/qt/MainQt.cpp 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Source/WebKit2/qt/MainQt.cpp 2012-05-03 11:14:20 UTC (rev 115958)
@@ -48,6 +48,14 @@
// to reimplement the handling of command line arguments from QApplication.
int main(int argc, char** argv)
{
+#if !defined(NDEBUG) && defined(Q_OS_UNIX)
+if (qgetenv("QT_WEBKIT_PAUSE_WEB_PROCESS") == "1" || qgetenv("QT_WEBKIT2_DEBUG") == "1") {
+fprintf(stderr, "Pausing web process, please attach to PID %d and continue... ", getpid());
+pause();
+fprintf(stderr, " OK\n");
+}
+#endif
+
WebKit::initializeWebKit2Theme();
// Has to be done before QApplication is constructed in case
Modified: trunk/Tools/ChangeLog (115957 => 115958)
--- trunk/Tools/ChangeLog 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Tools/ChangeLog 2012-05-03 11:14:20 UTC (rev 115958)
@@ -1,3 +1,17 @@
+2012-05-03 Tor Arne Vestbø
+
+[Qt] Allow the web process and WTR to be paused on startup
+
+Makes it easier to debug the web process or run-webkit-tests -2, as you
+have ample time to attach gdb to the process.
+
+Reviewed by Simon Hausmann.
+
+* Scripts/webkitpy/layout_tests/port/qt.py:
+(QtPort.setup_environ_for_server):
+* WebKitTestRunner/qt/main.cpp:
+(main):
+
2012-05-03 Csaba Osztrogonác
Password protect "Stop build" button
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (115957 => 115958)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-05-03 11:14:20 UTC (rev 115958)
@@ -136,6 +136,10 @@
clean_env = WebKitPort.setup_environ_for_server(self, server_name)
clean_env['QTWEBKIT_PLUGIN_PATH'] = self._build_path('lib/plugins')
self._copy_value_from_environ_if_set(clean_env, 'QT_DRT_WEBVIEW_MODE')
+self._copy_value_from_environ_if_set(clean_env, 'DYLD_IMAGE_SUFFIX')
+self._copy_value_from_environ_if_set(clean_env, 'QT_WEBKIT_LOG')
+self._copy_value_from_environ_if_set(clean_env, 'DISABLE_NI_WARNING')
+self._copy_value_from_environ_if_set(clean_env, 'QT_WEBKIT_PAUSE_UI_PROCESS')
return clean_env
# FIXME: We should find a way to share this implmentation with Gtk,
Modified: trunk/Tools/WebKitTestRunner/qt/main.cpp (115957 => 115958)
--- trunk/Tools/WebKitTestRunner/qt/main.cpp 2012-05-03 11:01:04 UTC (rev 115957)
+++ trunk/Tools/WebKitTestRunner/qt/main.cpp 2012-05-03 11:14:20 UTC (rev 115958)
@@ -75,6 +75,14 @@
int main(int argc, char** argv)
{
+#if !defined(NDEBUG) && defined(Q_OS_UNIX)
+if (qgetenv("QT_WEBKIT_PAUSE_UI_PROCESS") == "1") {
+fprintf(stderr, "Pausing UI process, please attach to PID %d and continue... ", getpid());
+pause();
+fprintf(stderr, " OK\n");
+}
+#endif
+
// Suppress debug output from Qt if not started with --verbose
bool suppressQtDebugOutput = true;
for (
[webkit-changes] [118148] trunk/Source/WebKit2
Title: [118148] trunk/Source/WebKit2
Revision 118148
Author ves...@webkit.org
Date 2012-05-23 01:32:20 -0700 (Wed, 23 May 2012)
Log Message
[Qt] Make QtWebError return the failing URL as a QString instead of QUrl
We don't want to use QUrl inside QtWebKit (only in the API layer), due
to how QUrl normalizes the url.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtWebError.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebError.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (118147 => 118148)
--- trunk/Source/WebKit2/ChangeLog 2012-05-23 08:25:58 UTC (rev 118147)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-23 08:32:20 UTC (rev 118148)
@@ -1,3 +1,16 @@
+2012-05-23 Tor Arne Vestbø
+
+[Qt] Make QtWebError return the failing URL as a QString instead of QUrl
+
+We don't want to use QUrl inside QtWebKit (only in the API layer), due
+to how QUrl normalizes the url.
+
+Reviewed by Simon Hausmann.
+
+* UIProcess/qt/QtWebError.cpp:
+(WebKit::QtWebError::url):
+* UIProcess/qt/QtWebError.h:
+
2012-05-22 Carlos Garcia Campos
[GTK] Add inspector API to WebKit2 GTK+
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebError.cpp (118147 => 118148)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebError.cpp 2012-05-23 08:25:58 UTC (rev 118147)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebError.cpp 2012-05-23 08:32:20 UTC (rev 118148)
@@ -55,10 +55,9 @@
return WKErrorGetErrorCode(error.get());
}
-QUrl QtWebError::url() const
+QString QtWebError::url() const
{
-WKRetainPtr failingURL = adoptWK(WKErrorCopyFailingURL(error.get()));
-return WKURLCopyQUrl(failingURL.get());
+return toImpl(error.get())->failingURL();
}
QString QtWebError::description() const
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebError.h (118147 => 118148)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebError.h 2012-05-23 08:25:58 UTC (rev 118147)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebError.h 2012-05-23 08:32:20 UTC (rev 118148)
@@ -43,7 +43,7 @@
};
Type type() const;
-QUrl url() const;
+QString url() const;
int errorCode() const;
QString description() const;
bool isCancellation() const;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [118153] trunk/Tools
Title: [118153] trunk/Tools
Revision 118153
Author ves...@webkit.org
Date 2012-05-23 03:39:06 -0700 (Wed, 23 May 2012)
Log Message
[Qt] Fix qmake conditional for c++-11 compat warnings
Patch by Oswald Buddenhagen on 2012-05-23
Reviewed by Tor Arne Vestbø.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/unix/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (118152 => 118153)
--- trunk/Tools/ChangeLog 2012-05-23 10:08:46 UTC (rev 118152)
+++ trunk/Tools/ChangeLog 2012-05-23 10:39:06 UTC (rev 118153)
@@ -1,3 +1,11 @@
+2012-05-23 Oswald Buddenhagen
+
+[Qt] Fix qmake conditional for c++-11 compat warnings
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/unix/default_post.prf:
+
2012-05-23 Christophe Dumez
[EFL] EFL's DRT does not print didFailProvisionalLoadWithError messages
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (118152 => 118153)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-23 10:08:46 UTC (rev 118152)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-23 10:39:06 UTC (rev 118153)
@@ -16,7 +16,7 @@
linux-g++* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
-if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x) && !contains(QMAKE_CXXFLAGS, -std=c++11) && !contains(QMAKE_CXXFLAGS, -std=gnu++11)) {
+!contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) {
# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [118155] trunk
Title: [118155] trunk
Revision 118155
Author ves...@webkit.org
Date 2012-05-23 03:50:53 -0700 (Wed, 23 May 2012)
Log Message
[Qt] Remove references to $$QT_SOURCE_TREE
With a modularized Qt, it's ambigious. What we really want is qtbase,
which qtcore is a proxy for (we assume it will always live in qtbase).
Patch by Oswald Buddenhagen on 2012-05-23
Reviewed by Tor Arne Vestbø.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.pri
trunk/Source/_javascript_Core/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (118154 => 118155)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-23 10:49:46 UTC (rev 118154)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-23 10:50:53 UTC (rev 118155)
@@ -1,3 +1,15 @@
+2012-05-23 Oswald Buddenhagen
+
+[Qt] Remove references to $$QT_SOURCE_TREE
+
+With a modularized Qt, it's ambigious. What we really want is qtbase,
+which qtcore is a proxy for (we assume it will always live in qtbase).
+
+Reviewed by Tor Arne Vestbø.
+
+* _javascript_Core.pri:
+* Target.pri:
+
2012-05-09 Filip Pizlo
DFG should allow inlining in case of certain arity mismatches
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (118154 => 118155)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2012-05-23 10:49:46 UTC (rev 118154)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2012-05-23 10:50:53 UTC (rev 118155)
@@ -42,6 +42,6 @@
}
wince* {
-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
+INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat
INCLUDEPATH += $$SOURCE_DIR/os-win32
}
Modified: trunk/Source/_javascript_Core/Target.pri (118154 => 118155)
--- trunk/Source/_javascript_Core/Target.pri 2012-05-23 10:49:46 UTC (rev 118154)
+++ trunk/Source/_javascript_Core/Target.pri 2012-05-23 10:50:53 UTC (rev 118155)
@@ -27,7 +27,7 @@
}
wince* {
-SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c
+SOURCES += $$QT.core.sources/../3rdparty/ce-compat/ce_time.c
}
include(yarr/yarr.pri)
Modified: trunk/Tools/ChangeLog (118154 => 118155)
--- trunk/Tools/ChangeLog 2012-05-23 10:49:46 UTC (rev 118154)
+++ trunk/Tools/ChangeLog 2012-05-23 10:50:53 UTC (rev 118155)
@@ -1,5 +1,16 @@
2012-05-23 Oswald Buddenhagen
+[Qt] Remove references to $$QT_SOURCE_TREE
+
+With a modularized Qt, it's ambigious. What we really want is qtbase,
+which qtcore is a proxy for (we assume it will always live in qtbase).
+
+Reviewed by Tor Arne Vestbø.
+
+* DumpRenderTree/qt/DumpRenderTree.pro:
+
+2012-05-23 Oswald Buddenhagen
+
[Qt] Fix qmake conditional for c++-11 compat warnings
Reviewed by Tor Arne Vestbø.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (118154 => 118155)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-05-23 10:49:46 UTC (rev 118154)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-05-23 10:50:53 UTC (rev 118155)
@@ -50,7 +50,7 @@
main.cpp
wince*: {
-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat $$WCECOMPAT/include
+INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat $$WCECOMPAT/include
LIBS += $$WCECOMPAT/lib/wcecompat.lib
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [118158] trunk
Title: [118158] trunk Revision 118158 Author ves...@webkit.org Date 2012-05-23 04:03:11 -0700 (Wed, 23 May 2012) Log Message [Qt] Make the web view's url property follow the active url https://bugs.webkit.org/show_bug.cgi?id=77554 The url property of the webview now reflects the 'active' url of the page, which maps to either the currently loading url, in the case of an ongoing load, or the result of a load, even when the load failed. In practice this means that setting the url though QML, or navigating to a new url in the page by e.g clicking, will both instantly change the url-property of the webview to the target url. This differs from earlier behavior, where we would update the url when the load committed. An optional argument is added to loadHtml(), to allow setting the unreachable url when providing replacement content for failed loads. Finally, the location bar in the minibrowser is updated to behave a bit more like normal browsers in terms of when the url will change and how active focus is handled. Reviewed by Simon Hausmann. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_favIconLoad.qml trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.h trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml Added Paths trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/link.html trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/redirect.html Diff Modified: trunk/Source/WebKit2/ChangeLog (118157 => 118158) --- trunk/Source/WebKit2/ChangeLog 2012-05-23 10:56:14 UTC (rev 118157) +++ trunk/Source/WebKit2/ChangeLog 2012-05-23 11:03:11 UTC (rev 118158) @@ -1,3 +1,52 @@ +2012-04-18 Tor Arne Vestbø + +[Qt] Make the web view's url property follow the active url + +https://bugs.webkit.org/show_bug.cgi?id=77554 + +The url property of the webview now reflects the 'active' url of the +page, which maps to either the currently loading url, in the case of +an ongoing load, or the result of a load, even when the load failed. + +In practice this means that setting the url though QML, or navigating +to a new url in the page by e.g clicking, will both instantly change +the url-property of the webview to the target url. This differs from +earlier behavior, where we would update the url when the load +committed. + +An optional argument is added to loadHtml(), to allow setting +the unreachable url when providing replacement content for failed +loads. + +Finally, the location bar in the minibrowser is updated to behave +a bit more like normal browsers in terms of when the url will change +and how active focus is handled. + +Reviewed by Simon Hausmann. + +* UIProcess/API/qt/qquickwebview.cpp: +(QQuickWebViewPrivate::onComponentComplete): +(QQuickWebView::reload): +(QQuickWebView::url): +(QQuickWebView::setUrl): +(QQuickWebView::loadHtml): +* UIProcess/API/qt/qquickwebview_p.h: +* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro: +* UIProcess/API/qt/tests/qmltests/WebView.pro: +* UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml: +* UIProcess/API/qt/tests/qmltests/common/link.html: Added. +* UIProcess/API/qt/tests/qmltests/common/redirect.html: Added. +* UIProcess/qt/QtWebPageLoadClient.cpp: +(QtWebPageLoadClient::QtWebPageLoadClient): +(QtWebPageLoadClient::didStartProvisionalLoadForFrame): +(QtWebPageLoadClient::didReceiveServerRedirectForProvisionalLoadForFrame): +(QtWebPageLoadClient::didCommitLoadForFrame): +(QtWebPageLoadClient::dispatchLoadFailed): +(QtWebPageLoadClient::didFailProvisionalLoadWithErrorForFrame): +(QtWebPageLoadClient::didFailLoadWithErrorForFrame): +* UIProcess/qt/QtWebPageLoadClient.h: +(QtWebPageLoadClient): + 2012-05-23 Simon Hausmann [Qt] Race condition in LayerTreeHost/Proxy can cause blank rendering Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (118157 => 118158) --- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-23 10:56:14 UTC (rev 118157) +++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-23 11:03:11 UTC (rev 118158) @@ -328,21 +328,29 @@ \qmlsignal WebView::loadingChanged(WebLoadRequest request) */ -void QQuickWebViewPrivate::provisionalLoadDidStart(const QUrl& url) +void QQuickWebViewPrivate::provisionalLoadDid
[webkit-changes] [118755] trunk/Tools
Title: [118755] trunk/Tools
Revision 118755
Author ves...@webkit.org
Date 2012-05-29 04:42:35 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Cancel potential url-edit when going back/forward
Reviewed by Kenneth Rohde Christiansen.
* MiniBrowser/qt/qml/BrowserWindow.qml:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
Diff
Modified: trunk/Tools/ChangeLog (118754 => 118755)
--- trunk/Tools/ChangeLog 2012-05-29 11:37:41 UTC (rev 118754)
+++ trunk/Tools/ChangeLog 2012-05-29 11:42:35 UTC (rev 118755)
@@ -1,3 +1,11 @@
+2012-05-23 Tor Arne Vestbø
+
+[Qt] Cancel potential url-edit when going back/forward
+
+Reviewed by Kenneth Rohde Christiansen.
+
+* MiniBrowser/qt/qml/BrowserWindow.qml:
+
2012-05-29 Christophe Dumez
[EFL] Compilation warning in DumpRenderTreeView.cpp
Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (118754 => 118755)
--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-05-29 11:37:41 UTC (rev 118754)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-05-29 11:42:35 UTC (rev 118755)
@@ -105,6 +105,7 @@
if (parent.enabled) {
console.log("MiniBrowser: Going backward in session history.")
webView.goBack()
+webView.forceActiveFocus()
}
}
}
@@ -139,6 +140,7 @@
if (parent.enabled) {
console.log("MiniBrowser: Going forward in session history.")
webView.goForward()
+webView.forceActiveFocus()
}
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [118762] trunk
Title: [118762] trunk
Revision 118762
Author ves...@webkit.org
Date 2012-05-29 06:17:23 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Sync up favicon-implementation with WebView url changes in r118158
https://bugs.webkit.org/show_bug.cgi?id=87133
We now base64-encode the page url in the image-provider url, so that any
normalization done by QUrl will not mess up the page-url. The logic of
creating and parsing the provider-url has been moved into the image
provider, to keep it in one place.
We were also releasing icons (even ones we hadn't retained), which we can't
do since we don't know when the icon url is no longer in use.
Reviewed-by Simon Hausmann.
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/declarative/plugin.cpp
trunk/Source/WebKit/qt/declarative/public.pri
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_favIconLoad.qml
trunk/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/icons/favicon.png
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (118761 => 118762)
--- trunk/Source/WebKit/qt/ChangeLog 2012-05-29 12:25:07 UTC (rev 118761)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-05-29 13:17:23 UTC (rev 118762)
@@ -1,3 +1,22 @@
+2012-05-29 Tor Arne Vestbø
+
+[Qt] Sync up favicon-implementation with WebView url changes in r118158
+
+https://bugs.webkit.org/show_bug.cgi?id=87133
+
+We now base64-encode the page url in the image-provider url, so that any
+normalization done by QUrl will not mess up the page-url. The logic of
+creating and parsing the provider-url has been moved into the image
+provider, to keep it in one place.
+
+We were also releasing icons (even ones we hadn't retained), which we can't
+do since we don't know when the icon url is no longer in use.
+
+Reviewed-by Simon Hausmann.
+
+* declarative/plugin.cpp:
+* declarative/public.pri:
+
2012-05-25 Jesus Sanchez-Palencia
WebKitTestRunner needs to support layoutTestController.setJavaScriptProfilingEnabled
Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (118761 => 118762)
--- trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-05-29 12:25:07 UTC (rev 118761)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-05-29 13:17:23 UTC (rev 118762)
@@ -17,6 +17,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include "qglobal.h"
#if defined(HAVE_QQUICK1)
Modified: trunk/Source/WebKit/qt/declarative/public.pri (118761 => 118762)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-05-29 12:25:07 UTC (rev 118761)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-05-29 13:17:23 UTC (rev 118762)
@@ -34,6 +34,8 @@
HEADERS += qdeclarativewebview_p.h
}
+WEBKIT += wtf
+
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
CONFIG += rpath
Modified: trunk/Source/WebKit2/ChangeLog (118761 => 118762)
--- trunk/Source/WebKit2/ChangeLog 2012-05-29 12:25:07 UTC (rev 118761)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-29 13:17:23 UTC (rev 118762)
@@ -1,3 +1,43 @@
+2012-05-29 Tor Arne Vestbø
+
+[Qt] Sync up favicon-implementation with WebView url changes in r118158
+
+https://bugs.webkit.org/show_bug.cgi?id=87133
+
+We now base64-encode the page url in the image-provider url, so that any
+normalization done by QUrl will not mess up the page-url. The logic of
+creating and parsing the provider-url has been moved into the image
+provider, to keep it in one place.
+
+We were also releasing icons (even ones we hadn't retained), which we can't
+do since we don't know when the icon url is no longer in use.
+
+Reviewed-by Simon Hausmann.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+(QQuickWebViewPrivate::loadProgressDidChange):
+(QQuickWebViewPrivate::_q_onUrlChanged):
+(QQuickWebViewPrivate::_q_onIconChangedForPageURL):
+(QQuickWebViewPrivate::updateIcon):
+(QQuickWebView::icon):
+* UIProcess/API/qt/qquickwebview_p.h:
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+* UIProcess/API/qt/qwebiconimageprovider.cpp:
+(QWebIconImageProvider::iconURLForPageURLInContext):
+(QWebIconImageProvider::requestImage):
+* UIProcess/API/qt/qwebiconimageprovider_p.h:
+(WebKit):
+* UIProcess/API/qt/tests/qmltests/WebView/tst_favIcon
[webkit-changes] [118763] trunk/Tools
Title: [118763] trunk/Tools
Revision 118763
Author ves...@webkit.org
Date 2012-05-29 06:21:43 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Don't add cxx-flags to QMAKE_CFLAGS
Prevents warnings such as: "command line option ‘-Wno-c++0x-compat’ is
valid for C++/ObjC++ but not for C [enabled by default]"
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/unix/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (118762 => 118763)
--- trunk/Tools/ChangeLog 2012-05-29 13:17:23 UTC (rev 118762)
+++ trunk/Tools/ChangeLog 2012-05-29 13:21:43 UTC (rev 118763)
@@ -1,5 +1,16 @@
2012-05-29 Tor Arne Vestbø
+[Qt] Don't add cxx-flags to QMAKE_CFLAGS
+
+Prevents warnings such as: "command line option ‘-Wno-c++0x-compat’ is
+valid for C++/ObjC++ but not for C [enabled by default]"
+
+Reviewed by Simon Hausmann.
+
+* qmake/mkspecs/features/unix/default_post.prf:
+
+2012-05-29 Tor Arne Vestbø
+
[Qt] Sync up favicon-implementation with WebView url changes in r118158
https://bugs.webkit.org/show_bug.cgi?id=87133
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (118762 => 118763)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-29 13:17:23 UTC (rev 118762)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-29 13:21:43 UTC (rev 118763)
@@ -18,9 +18,7 @@
greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
!contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) {
# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
-QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
-QMAKE_CFLAGS += -Wno-c++0x-compat
QMAKE_CXXFLAGS += -Wno-c++0x-compat
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [118769] trunk/Source/WTF
Title: [118769] trunk/Source/WTF
Revision 118769
Author ves...@webkit.org
Date 2012-05-29 06:53:04 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Remove duplication of logic for disabling selected warnings related to C++11
This is already handled in unix/default_post.prf
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.pro
Diff
Modified: trunk/Source/WTF/ChangeLog (118768 => 118769)
--- trunk/Source/WTF/ChangeLog 2012-05-29 13:41:08 UTC (rev 118768)
+++ trunk/Source/WTF/ChangeLog 2012-05-29 13:53:04 UTC (rev 118769)
@@ -1,3 +1,13 @@
+2012-05-29 Tor Arne Vestbø
+
+[Qt] Remove duplication of logic for disabling selected warnings related to C++11
+
+This is already handled in unix/default_post.prf
+
+Reviewed by Simon Hausmann.
+
+* WTF.pro:
+
2012-05-27 Darin Adler
Fix an incorrect assertion in Vector::remove
Modified: trunk/Source/WTF/WTF.pro (118768 => 118769)
--- trunk/Source/WTF/WTF.pro 2012-05-29 13:41:08 UTC (rev 118768)
+++ trunk/Source/WTF/WTF.pro 2012-05-29 13:53:04 UTC (rev 118769)
@@ -240,22 +240,8 @@
QMAKE_CFLAGS += -mieee -w
}
-lessThan(QT_GCC_MAJOR_VERSION, 5) {
-# GCC 4.5 and before
-lessThan(QT_GCC_MINOR_VERSION, 6) {
-# Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
-*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
-}
-
-# GCC 4.6 and after.
-greaterThan(QT_GCC_MINOR_VERSION, 5) {
-if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
-# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
-QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
-QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
-QMAKE_CFLAGS += -Wno-c++0x-compat
-QMAKE_CXXFLAGS += -Wno-c++0x-compat
-}
-}
+*-g++*:lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
+# For GCC 4.5 and before we disable C++0x mode in JSC for if enabled in Qt's mkspec
+QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x -std=c++11 -std=gnu++11
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [119211] trunk/Tools
Title: [119211] trunk/Tools Revision 119211 Author ves...@webkit.org Date 2012-06-01 04:18:32 -0700 (Fri, 01 Jun 2012) Log Message [Qt] Make Qt Creator aware of files in webkitpy/perl for easy editing Reviewed by Simon Hausmann. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Tools.pro Diff Modified: trunk/Tools/ChangeLog (119210 => 119211) --- trunk/Tools/ChangeLog 2012-06-01 11:12:20 UTC (rev 119210) +++ trunk/Tools/ChangeLog 2012-06-01 11:18:32 UTC (rev 119211) @@ -1,3 +1,11 @@ +2012-06-01 Tor Arne Vestbø + +[Qt] Make Qt Creator aware of files in webkitpy/perl for easy editing + +Reviewed by Simon Hausmann. + +* Tools.pro: + 2012-06-01 Ryosuke Niwa Add public page loading performance tests using web-page-replay Modified: trunk/Tools/Tools.pro (119210 => 119211) --- trunk/Tools/Tools.pro 2012-06-01 11:12:20 UTC (rev 119210) +++ trunk/Tools/Tools.pro 2012-06-01 11:18:32 UTC (rev 119211) @@ -29,6 +29,8 @@ OTHER_FILES = \ Scripts/* \ +$$files(Scripts/webkitpy/*.py, true) \ +$$files(Scripts/webkitperl/*.p[l|m], true) \ qmake/README \ qmake/configure.pro \ qmake/sync.profile \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [119217] trunk/Source/WTF
Title: [119217] trunk/Source/WTF
Revision 119217
Author ves...@webkit.org
Date 2012-06-01 05:25:31 -0700 (Fri, 01 Jun 2012)
Log Message
[Qt] Make conversion from QString to WTF::String (and back again) ~free
https://bugs.webkit.org/show_bug.cgi?id=87847
Instead of copying the QString data when converting to a WTF::String we
make the WTF::String adopt the QString data by introducing a new buffer
ownership type, and pointing the internal WTF::StringImpl 16-bit data
member to the string data managed by QStringData.
We make sure to reference the QStringData when adopting, so that the
data will stay alive, and then dereference it when the WTF::StringImpl
is deleted, which will free the QStringData (either straight away, if
we're the only one holding a reference still, or later, when the ref
count goes to 0).
In the case of going back from a WTF::String to a QString we can cheat
a bit (avoid a copy), if we know that the WTF::String was adopted from
a QString, since it's then just a matter of having the QString adopt
the existing QStringData (just like a regular QString copy).
If the WTF::String buffer is not owned by QStringData, eg a regular
8-bit or 16-bit string/substring, we have to fall back to copying,
as before (though there are potential optimization tricks we can
apply here later on).
Reviewed by Gavin Barraclough.
* wtf/qt/StringQt.cpp:
* wtf/text/StringImpl.cpp:
* wtf/text/StringImpl.h:
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/qt/StringQt.cpp
trunk/Source/WTF/wtf/text/StringImpl.cpp
trunk/Source/WTF/wtf/text/StringImpl.h
Diff
Modified: trunk/Source/WTF/ChangeLog (119216 => 119217)
--- trunk/Source/WTF/ChangeLog 2012-06-01 12:21:31 UTC (rev 119216)
+++ trunk/Source/WTF/ChangeLog 2012-06-01 12:25:31 UTC (rev 119217)
@@ -1,3 +1,36 @@
+2012-05-30 Tor Arne Vestbø
+
+[Qt] Make conversion from QString to WTF::String (and back again) ~free
+
+https://bugs.webkit.org/show_bug.cgi?id=87847
+
+Instead of copying the QString data when converting to a WTF::String we
+make the WTF::String adopt the QString data by introducing a new buffer
+ownership type, and pointing the internal WTF::StringImpl 16-bit data
+member to the string data managed by QStringData.
+
+We make sure to reference the QStringData when adopting, so that the
+data will stay alive, and then dereference it when the WTF::StringImpl
+is deleted, which will free the QStringData (either straight away, if
+we're the only one holding a reference still, or later, when the ref
+count goes to 0).
+
+In the case of going back from a WTF::String to a QString we can cheat
+a bit (avoid a copy), if we know that the WTF::String was adopted from
+a QString, since it's then just a matter of having the QString adopt
+the existing QStringData (just like a regular QString copy).
+
+If the WTF::String buffer is not owned by QStringData, eg a regular
+8-bit or 16-bit string/substring, we have to fall back to copying,
+as before (though there are potential optimization tricks we can
+apply here later on).
+
+Reviewed by Gavin Barraclough.
+
+* wtf/qt/StringQt.cpp:
+* wtf/text/StringImpl.cpp:
+* wtf/text/StringImpl.h:
+
2012-06-01 Sudarsana Nagineni
[EFL] Implement PlatformStrategies
Modified: trunk/Source/WTF/wtf/qt/StringQt.cpp (119216 => 119217)
--- trunk/Source/WTF/wtf/qt/StringQt.cpp 2012-06-01 12:21:31 UTC (rev 119216)
+++ trunk/Source/WTF/wtf/qt/StringQt.cpp 2012-06-01 12:25:31 UTC (rev 119217)
@@ -37,7 +37,11 @@
{
if (qstr.isNull())
return;
+#if HAVE(QT5)
+m_impl = StringImpl::adopt(const_cast(qstr).data_ptr());
+#else
m_impl = StringImpl::create(reinterpret_cast_ptr(qstr.constData()), qstr.length());
+#endif
}
String::String(const QStringRef& ref)
@@ -49,6 +53,19 @@
String::operator QString() const
{
+if (!m_impl)
+return QString();
+
+#if HAVE(QT5)
+if (QStringData* qStringData = m_impl->qStringData()) {
+// The WTF string was adopted from a QString at some point, so we
+// can just adopt the QStringData like a regular QString copy.
+qStringData->ref.ref();
+QStringDataPtr qStringDataPointer = { qStringData };
+return QString(qStringDataPointer);
+}
+#endif
+
return QString(reinterpret_cast(characters()), length());
}
Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (119216 => 119217)
--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2012-06-01 12:21:31 UTC (rev 119216)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2012-06-01 12:25:31 UTC (rev 119217)
@@ -69,6 +69,13 @@
fastFree(const_cast(m_data8));
return;
}
+#if PLATFORM(QT) && HAVE(QT5)
+if (ownership == BufferAdoptedQString) {
+if (!m_qStringData->ref.deref())
+QStringData::deallocate(m_qStringData);
+retu
[webkit-changes] [119222] trunk/Source/WTF
Title: [119222] trunk/Source/WTF
Revision 119222
Author ves...@webkit.org
Date 2012-06-01 05:52:27 -0700 (Fri, 01 Jun 2012)
Log Message
[Qt] Save one copy when going from 8-bit WTF::String to QString
Asking for characters() of an 8-bit string will make a 16-bit copy internally
in WTF::String. Since we're going to copy the data to QStringData anyways, which
is 16-bit, we can do the conversion ourselves and save one copy.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/qt/StringQt.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (119221 => 119222)
--- trunk/Source/WTF/ChangeLog 2012-06-01 12:50:38 UTC (rev 119221)
+++ trunk/Source/WTF/ChangeLog 2012-06-01 12:52:27 UTC (rev 119222)
@@ -1,3 +1,16 @@
+2012-06-01 Tor Arne Vestbø
+
+[Qt] Save one copy when going from 8-bit WTF::String to QString
+
+Asking for characters() of an 8-bit string will make a 16-bit copy internally
+in WTF::String. Since we're going to copy the data to QStringData anyways, which
+is 16-bit, we can do the conversion ourselves and save one copy.
+
+Reviewed by Simon Hausmann.
+
+* wtf/qt/StringQt.cpp:
+(WTF::String::operator QString):
+
2012-05-30 Tor Arne Vestbø
[Qt] Make conversion from QString to WTF::String (and back again) ~free
Modified: trunk/Source/WTF/wtf/qt/StringQt.cpp (119221 => 119222)
--- trunk/Source/WTF/wtf/qt/StringQt.cpp 2012-06-01 12:50:38 UTC (rev 119221)
+++ trunk/Source/WTF/wtf/qt/StringQt.cpp 2012-06-01 12:52:27 UTC (rev 119222)
@@ -65,6 +65,12 @@
return QString(qStringDataPointer);
}
#endif
+if (is8Bit() && !m_impl->has16BitShadow()) {
+// Asking for characters() of an 8-bit string will make a 16-bit copy internally
+// in WTF::String. Since we're going to copy the data to QStringData anyways, we
+// can do the conversion ourselves and save one copy.
+return QString::fromLatin1(reinterpret_cast(characters8()), length());
+}
return QString(reinterpret_cast(characters()), length());
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [119381] trunk/Source/WebKit
Title: [119381] trunk/Source/WebKit Revision 119381 Author ves...@webkit.org Date 2012-06-04 03:24:38 -0700 (Mon, 04 Jun 2012) Log Message [Qt] Don't use WebKit HAVE() macro in public Qt headers Reviewed by Kenneth Rohde Christiansen. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.pri trunk/Source/WebKit/qt/Api/qgraphicswebview.h trunk/Source/WebKit/qt/Api/qwebframe_p.h trunk/Source/WebKit/qt/Api/qwebpage.h trunk/Source/WebKit/qt/Api/qwebview.h trunk/Source/WebKit/qt/ChangeLog Diff Modified: trunk/Source/WebKit/ChangeLog (119380 => 119381) --- trunk/Source/WebKit/ChangeLog 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/ChangeLog 2012-06-04 10:24:38 UTC (rev 119381) @@ -1,3 +1,11 @@ +2012-06-04 Tor Arne Vestbø + +[Qt] Don't use WebKit HAVE() macro in public Qt headers + +Reviewed by Kenneth Rohde Christiansen. + +* WebKit.pri: + 2012-06-04 Tomasz Morawski [EFL] Refactor ewk_view_context_paint code. Modified: trunk/Source/WebKit/WebKit.pri (119380 => 119381) --- trunk/Source/WebKit/WebKit.pri 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/WebKit.pri 2012-06-04 10:24:38 UTC (rev 119381) @@ -18,6 +18,7 @@ HEADERS += \ $$PWD/qt/Api/qwebframe.h \ +$$PWD/qt/Api/qwebframe_p.h \ $$PWD/qt/Api/qgraphicswebview.h \ $$PWD/qt/Api/qwebkitglobal.h \ $$PWD/qt/Api/qwebkitplatformplugin.h \ Modified: trunk/Source/WebKit/qt/Api/qgraphicswebview.h (119380 => 119381) --- trunk/Source/WebKit/qt/Api/qgraphicswebview.h 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/qt/Api/qgraphicswebview.h 2012-06-04 10:24:38 UTC (rev 119381) @@ -23,7 +23,7 @@ #include "qwebkitglobal.h" #include "qwebpage.h" #include -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include #else #include Modified: trunk/Source/WebKit/qt/Api/qwebframe_p.h (119380 => 119381) --- trunk/Source/WebKit/qt/Api/qwebframe_p.h 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/qt/Api/qwebframe_p.h 2012-06-04 10:24:38 UTC (rev 119381) @@ -30,7 +30,7 @@ #include "PlatformString.h" #if ENABLE(ORIENTATION_EVENTS) #include "qorientationsensor.h" -#if !(defined(HAVE_QT5) && HAVE_QT5) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) using QTM_NAMESPACE::QOrientationSensor; #endif #endif // ENABLE(ORIENTATION_EVENTS). Modified: trunk/Source/WebKit/qt/Api/qwebpage.h (119380 => 119381) --- trunk/Source/WebKit/qt/Api/qwebpage.h 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/qt/Api/qwebpage.h 2012-06-04 10:24:38 UTC (rev 119381) @@ -26,7 +26,7 @@ #include #include -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include #else #include Modified: trunk/Source/WebKit/qt/Api/qwebview.h (119380 => 119381) --- trunk/Source/WebKit/qt/Api/qwebview.h 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/qt/Api/qwebview.h 2012-06-04 10:24:38 UTC (rev 119381) @@ -23,7 +23,7 @@ #include "qwebkitglobal.h" #include "qwebpage.h" -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include #else #include Modified: trunk/Source/WebKit/qt/ChangeLog (119380 => 119381) --- trunk/Source/WebKit/qt/ChangeLog 2012-06-04 10:09:59 UTC (rev 119380) +++ trunk/Source/WebKit/qt/ChangeLog 2012-06-04 10:24:38 UTC (rev 119381) @@ -1,3 +1,14 @@ +2012-06-04 Tor Arne Vestbø + +[Qt] Don't use WebKit HAVE() macro in public Qt headers + +Reviewed by Kenneth Rohde Christiansen. + +* Api/qgraphicswebview.h: +* Api/qwebframe_p.h: +* Api/qwebpage.h: +* Api/qwebview.h: + 2012-06-02 Zoltan Arvai [Qt] Use 'Ok' and 'Cancel' buttons in _javascript_ confirm box. ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [119517] trunk/Source/WebKit2
Title: [119517] trunk/Source/WebKit2
Revision 119517
Author ves...@webkit.org
Date 2012-06-05 13:06:26 -0700 (Tue, 05 Jun 2012)
Log Message
[Qt] Implement log channel initialization for WebKit2
Reviewed by Alexis Menard.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/Logging.cpp
trunk/Source/WebKit2/Platform/Logging.h
trunk/Source/WebKit2/Target.pri
Added Paths
trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119516 => 119517)
--- trunk/Source/WebKit2/ChangeLog 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-05 20:06:26 UTC (rev 119517)
@@ -1,3 +1,18 @@
+2012-06-05 Tor Arne Vestbø
+
+[Qt] Implement log channel initialization for WebKit2
+
+Reviewed by Alexis Menard.
+
+* Platform/Logging.cpp:
+(WebKit):
+* Platform/Logging.h:
+(WebKit):
+* Platform/qt/LoggingQt.cpp: Copied from Source/WebKit2/Platform/gtk/LoggingGtk.cpp
+(WebKit):
+(WebKit::initializeLogChannel):
+* Target.pri:
+
2012-06-05 Jocelyn Turcotte
WebLayerTreeRenderer behaves wrongly when no contentsScale is set.
Modified: trunk/Source/WebKit2/Platform/Logging.cpp (119516 => 119517)
--- trunk/Source/WebKit2/Platform/Logging.cpp 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2012-06-05 20:06:26 UTC (rev 119517)
@@ -38,14 +38,14 @@
WTFLogChannel LogIconDatabase = { 0x0010, "WebKit2LogLevel", WTFLogChannelOff };
WTFLogChannel LogKeyHandling = { 0x0020, "WebKit2LogLevel", WTFLogChannelOff };
-#if !PLATFORM(MAC) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT)
void initializeLogChannel(WTFLogChannel* channel)
{
// FIXME: Each platform will need to define their own initializeLogChannel().
}
#endif
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(QT)
WTFLogChannel* getChannelFromName(const String& channelName)
{
if (!(channelName.length() >= 2))
Modified: trunk/Source/WebKit2/Platform/Logging.h (119516 => 119517)
--- trunk/Source/WebKit2/Platform/Logging.h 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/Platform/Logging.h 2012-06-05 20:06:26 UTC (rev 119517)
@@ -46,7 +46,7 @@
void initializeLogChannel(WTFLogChannel*);
void initializeLogChannelsIfNecessary(void);
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(QT)
WTFLogChannel* getChannelFromName(const String& channelName);
#endif
Copied: trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp (from rev 119516, trunk/Source/WebKit2/Platform/Logging.h) (0 => 119517)
--- trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp 2012-06-05 20:06:26 UTC (rev 119517)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Logging.h"
+
+#include
+#include
+
+namespace WebKit {
+
+#if !LOG_DISABLED
+
+void initializeLogChannel(WTFLogChannel* channel)
+{
+static Vector activatedChannels;
+
+QByteArray loggingEnv = qgetenv("QT_WEBKIT_LOG");
+if (loggingEnv.isEmpty())
+return;
+
+// Fill activatedChannels vector only once based on names set in logValue.
+if (activatedChannels.isEmpty()) {
+QStringList channels = QString::fromLocal8Bit(loggingEnv).split(QLatin1String(","));
+for (int i = 0; i < channels.count(); i++) {
+if (WTFLogChannel* activeChannel = getChannelFromName(channels.at(i)))
+activatedChannels.append(activeChannel);
+
[webkit-changes] [119586] trunk/Source/WebCore
Title: [119586] trunk/Source/WebCore
Revision 119586
Author ves...@webkit.org
Date 2012-06-06 04:41:19 -0700 (Wed, 06 Jun 2012)
Log Message
Fix a few spelling mistakes in IconDatabase logging
Makes debugging harder if the logging is confusing.
Reviewed by Jocelyn Turcotte.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/icon/IconDatabase.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (119585 => 119586)
--- trunk/Source/WebCore/ChangeLog 2012-06-06 11:37:02 UTC (rev 119585)
+++ trunk/Source/WebCore/ChangeLog 2012-06-06 11:41:19 UTC (rev 119586)
@@ -1,3 +1,15 @@
+2012-06-06 Tor Arne Vestbø
+
+Fix a few spelling mistakes in IconDatabase logging
+
+Makes debugging harder if the logging is confusing.
+
+Reviewed by Jocelyn Turcotte.
+
+* loader/icon/IconDatabase.cpp:
+(WebCore::IconDatabase::notifyPendingLoadDecisions):
+(WebCore::IconDatabase::readFromDatabase):
+
2012-05-25 Vsevolod Vlasov
Web Inspector: [Compiler] Remove compile-front-end.sh and fix InjectedScriptSource errors.
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (119585 => 119586)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-06-06 11:37:02 UTC (rev 119585)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-06-06 11:41:19 UTC (rev 119586)
@@ -810,7 +810,7 @@
// This method should only be called upon completion of the initial url import from the database
ASSERT(m_iconURLImportComplete);
-LOG(IconDatabase, "Notifying all DocumentLoaders that were waiting on a load decision for thier icons");
+LOG(IconDatabase, "Notifying all DocumentLoaders that were waiting on a load decision for their icons");
HashSet >::iterator i = m_loadersPendingDecision.begin();
HashSet >::iterator end = m_loadersPendingDecision.end();
@@ -1591,7 +1591,7 @@
HashSet::const_iterator end = outerHash->end();
for (; iter != end; ++iter) {
if (innerHash->contains(*iter)) {
-LOG(IconDatabase, "%s is interesting in the icon we just read. Adding it to the list and removing it from the interested set", urlForLogging(*iter).ascii().data());
+LOG(IconDatabase, "%s is interested in the icon we just read. Adding it to the notification list and removing it from the interested set", urlForLogging(*iter).ascii().data());
urlsToNotify.add(*iter);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [109887] trunk/Tools
Title: [109887] trunk/Tools
Revision 109887
Author ves...@webkit.org
Date 2012-03-06 02:00:25 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Use correct define names for HAVE(FOO) style optional dependencies
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (109886 => 109887)
--- trunk/Tools/ChangeLog 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/ChangeLog 2012-03-06 10:00:25 UTC (rev 109887)
@@ -1,3 +1,16 @@
+2012-03-06 Tor Arne Vestbø
+
+[Qt] Use correct define names for HAVE(FOO) style optional dependencies
+
+Reviewed by Simon Hausmann.
+
+* DumpRenderTree/qt/DumpRenderTree.pro:
+* DumpRenderTree/qt/QtInitializeTestFonts.cpp:
+(WebKit::initializeTestFonts):
+* QtTestBrowser/QtTestBrowser.pro:
+* WebKitTestRunner/InjectedBundle/Target.pri:
+* qmake/mkspecs/features/features.prf:
+
2012-03-06 Kristóf Kosztyó
[Qt] Create EWS to build WebKit2
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (109886 => 109887)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 10:00:25 UTC (rev 109887)
@@ -23,7 +23,7 @@
macx: QT += xml
haveQt(5): QT += widgets printsupport
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
HEADERS += \
$$PWD/../WorkQueue.h \
Modified: trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp (109886 => 109887)
--- trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 10:00:25 UTC (rev 109887)
@@ -26,9 +26,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "QtInitializeTestFonts.h"
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
#include
#include
#include
@@ -38,7 +40,7 @@
void initializeTestFonts()
{
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
static int numFonts = -1;
FcInit();
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (109886 => 109887)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 10:00:25 UTC (rev 109887)
@@ -50,7 +50,7 @@
macx:QT += xml
haveQt(5): QT += printsupport widgets
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
contains(QT_CONFIG, opengl) {
QT += opengl
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (109886 => 109887)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 10:00:25 UTC (rev 109887)
@@ -58,7 +58,7 @@
CONFIG += plugin qtwebkit rpath
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109886 => 109887)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 09:49:22 UTC (rev 109886)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 10:00:25 UTC (rev 109887)
@@ -46,12 +46,16 @@
}
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
-haveQt(5):contains(config_test_fontconfig, yes):!mac {
-DEFINES += HAVE_FONTCONFIG=1
+haveQt(5) {
+contains(config_test_fontconfig, yes):!mac {
+DEFINES += WTF_HAVE_FONTCONFIG=1
+}
+} else {
+# Qt 4
+unix:!mac:!embedded {
+DEFINES += WTF_HAVE_FONTCONFIG=1
+}
}
-haveQt(4):unix:!mac:!embedded {
-DEFINES += HAVE_FONTCONFIG=1
-}
# Feature defines: for web-facing features only
!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
@@ -136,7 +140,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
+haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += WTF_HAVE_QSTYLE=1
# WebGL support
contains(QT_CONFIG, opengl):!win32-* {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [109894] trunk/Tools
Title: [109894] trunk/Tools Revision 109894 Author ves...@webkit.org Date 2012-03-06 03:51:17 -0800 (Tue, 06 Mar 2012) Log Message [Qt] Make sure clean builds are followed by make qmake && make if needed On non-GNUmake systems we have to run make qmake so that the generated sources are generated before we run qmake on the target pro files. This is achieved by using the 'incremental' target. Reviewed by Ossy. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitdirs.pm Diff Modified: trunk/Tools/ChangeLog (109893 => 109894) --- trunk/Tools/ChangeLog 2012-03-06 11:31:04 UTC (rev 109893) +++ trunk/Tools/ChangeLog 2012-03-06 11:51:17 UTC (rev 109894) @@ -1,3 +1,16 @@ +2012-03-06 Tor Arne Vestbø + +[Qt] Make sure clean builds are followed by make qmake && make if needed + +On non-GNUmake systems we have to run make qmake so that the generated +sources are generated before we run qmake on the target pro files. This +is achieved by using the 'incremental' target. + +Reviewed by Ossy. + +* Scripts/webkitdirs.pm: +(buildQMakeProjects): + 2012-03-06 Filip Pizlo DumpRenderTree should support preciseTime() Modified: trunk/Tools/Scripts/webkitdirs.pm (109893 => 109894) --- trunk/Tools/Scripts/webkitdirs.pm 2012-03-06 11:31:04 UTC (rev 109893) +++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-06 11:51:17 UTC (rev 109894) @@ -2191,6 +2191,9 @@ # to run config tests and generate the removed Tools/qmake/.qmake.cache again. qtFeatureDefaults(\@buildArgs); #} + +# Still trigger an incremental build +$buildHint = "incremental"; } # Save config up-front so we can detect changes to the build config even ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [109896] trunk/Tools
Title: [109896] trunk/Tools
Revision 109896
Author ves...@webkit.org
Date 2012-03-06 04:03:46 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Don't add recursive qmake_all target if there are no subdirs to recurse
Reviewed by Ossy.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
Diff
Modified: trunk/Tools/ChangeLog (109895 => 109896)
--- trunk/Tools/ChangeLog 2012-03-06 12:00:59 UTC (rev 109895)
+++ trunk/Tools/ChangeLog 2012-03-06 12:03:46 UTC (rev 109896)
@@ -1,5 +1,13 @@
2012-03-06 Tor Arne Vestbø
+[Qt] Don't add recursive qmake_all target if there are no subdirs to recurse
+
+Reviewed by Ossy.
+
+* qmake/mkspecs/features/default_post.prf:
+
+2012-03-06 Tor Arne Vestbø
+
[Qt] Make sure clean builds are followed by make qmake && make if needed
On non-GNUmake systems we have to run make qmake so that the generated
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (109895 => 109896)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-03-06 12:00:59 UTC (rev 109895)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-03-06 12:03:46 UTC (rev 109896)
@@ -252,7 +252,7 @@
recursive_qmake.depends += $${target_name}
}
-QMAKE_EXTRA_TARGETS += recursive_qmake
+!isEmpty(recursive_qmake.depends): QMAKE_EXTRA_TARGETS += recursive_qmake
}
incremental.target = incremental
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [109900] trunk/Tools
Title: [109900] trunk/Tools
Revision 109900
Author ves...@webkit.org
Date 2012-03-06 04:15:41 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Use correct define names for HAVE(FOO) style optional dependencies
Reviewed by Simon Hausmann.
Reviewed by Ossy.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (109899 => 109900)
--- trunk/Tools/ChangeLog 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/ChangeLog 2012-03-06 12:15:41 UTC (rev 109900)
@@ -1,5 +1,19 @@
2012-03-06 Tor Arne Vestbø
+[Qt] Use correct define names for HAVE(FOO) style optional dependencies
+
+Reviewed by Simon Hausmann.
+Reviewed by Ossy.
+
+* DumpRenderTree/qt/DumpRenderTree.pro:
+* DumpRenderTree/qt/QtInitializeTestFonts.cpp:
+(WebKit::initializeTestFonts):
+* QtTestBrowser/QtTestBrowser.pro:
+* WebKitTestRunner/InjectedBundle/Target.pri:
+* qmake/mkspecs/features/features.prf:
+
+2012-03-06 Tor Arne Vestbø
+
[Qt] Don't add recursive qmake_all target if there are no subdirs to recurse
Reviewed by Ossy.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (109899 => 109900)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 12:15:41 UTC (rev 109900)
@@ -23,7 +23,7 @@
macx: QT += xml
haveQt(5): QT += widgets printsupport
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
HEADERS += \
$$PWD/../WorkQueue.h \
Modified: trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp (109899 => 109900)
--- trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 12:15:41 UTC (rev 109900)
@@ -26,9 +26,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "QtInitializeTestFonts.h"
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
#include
#include
#include
@@ -38,7 +40,7 @@
void initializeTestFonts()
{
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
static int numFonts = -1;
FcInit();
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (109899 => 109900)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 12:15:41 UTC (rev 109900)
@@ -39,7 +39,7 @@
cookiejar.h
-WEBKIT += webcore
+WEBKIT += wtf webcore
CONFIG += qtwebkit
@@ -50,7 +50,7 @@
macx:QT += xml
haveQt(5): QT += printsupport widgets
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
contains(QT_CONFIG, opengl) {
QT += opengl
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (109899 => 109900)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 12:15:41 UTC (rev 109900)
@@ -58,7 +58,7 @@
CONFIG += plugin qtwebkit rpath
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109899 => 109900)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:15:41 UTC (rev 109900)
@@ -46,12 +46,16 @@
}
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
-haveQt(5):contains(config_test_fontconfig, yes):!mac {
-DEFINES += HAVE_FONTCONFIG=1
+haveQt(5) {
+contains(config_test_fontconfig, yes):!mac {
+DEFINES += WTF_HAVE_FONTCONFIG=1
+}
+} else {
+# Qt 4
+unix:!mac:!embedded {
+DEFINES += WTF_HAVE_FONTCONFIG=1
+}
}
-haveQt(4):unix:!mac:!embedded {
-DEFINES += HAVE_FONTCONFIG=1
-}
# Feature defines: for web-facing features only
!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
@@ -136,7 +140,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
+haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += WTF_HAVE_QSTYLE=1
# WebGL support
contains(QT_CONFIG, opengl):!win32-* {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-ch
[webkit-changes] [109904] trunk/Tools
Title: [109904] trunk/Tools
Revision 109904
Author ves...@webkit.org
Date 2012-03-06 04:34:05 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Use config test to determine if the compiler supports -MD
We used to assume that unix systems building against Qt5 would have
a compiler that supported -MD. Although this was usually the case,
we failed to take into account broken tools for distributed builds
(e.g. teambuilder or icecream) which would end up producing .d files
in the root of the build dir instead of along-side the object file.
Now that we use a config-test to determine the support, we'll capture
those cases, unless distributed builds are enabled after the initial
build-webkit run.
Reviewed by Csaba Osztrogonác.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Tools.pro
trunk/Tools/qmake/mkspecs/features/default_pre.prf
trunk/Tools/qmake/mkspecs/features/features.prf
trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf
trunk/Tools/qmake/sync.profile
Added Paths
trunk/Tools/qmake/config.tests/gccdepends/empty.cpp
trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro
Diff
Modified: trunk/Tools/ChangeLog (109903 => 109904)
--- trunk/Tools/ChangeLog 2012-03-06 12:28:57 UTC (rev 109903)
+++ trunk/Tools/ChangeLog 2012-03-06 12:34:05 UTC (rev 109904)
@@ -1,3 +1,27 @@
+2012-03-05 Tor Arne Vestbø
+
+[Qt] Use config test to determine if the compiler supports -MD
+
+We used to assume that unix systems building against Qt5 would have
+a compiler that supported -MD. Although this was usually the case,
+we failed to take into account broken tools for distributed builds
+(e.g. teambuilder or icecream) which would end up producing .d files
+in the root of the build dir instead of along-side the object file.
+
+Now that we use a config-test to determine the support, we'll capture
+those cases, unless distributed builds are enabled after the initial
+build-webkit run.
+
+Reviewed by Csaba Osztrogonác.
+
+* Tools.pro:
+* qmake/config.tests/gccdepends/empty.cpp: Added.
+* qmake/config.tests/gccdepends/gccdepends.pro: Added.
+* qmake/mkspecs/features/default_pre.prf:
+* qmake/mkspecs/features/features.prf:
+* qmake/mkspecs/features/unix/default_pre.prf:
+* qmake/sync.profile:
+
2012-03-06 Csaba Osztrogonác
REGRESSION(r109294): It broke the unittest of master.cfg
Modified: trunk/Tools/Tools.pro (109903 => 109904)
--- trunk/Tools/Tools.pro 2012-03-06 12:28:57 UTC (rev 109903)
+++ trunk/Tools/Tools.pro 2012-03-06 12:34:05 UTC (rev 109904)
@@ -29,6 +29,7 @@
qmake/sync.profile \
qmake/config.tests/README \
qmake/config.tests/fontconfig/* \
+qmake/config.tests/gccdepends/* \
qmake/mkspecs/modules/* \
qmake/mkspecs/features/*.prf \
qmake/mkspecs/features/mac/*.prf \
Added: trunk/Tools/qmake/config.tests/gccdepends/empty.cpp ( => )
Added: trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro
===
--- trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro (rev 0)
+++ trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-03-06 12:34:05 UTC (rev 109904)
@@ -0,0 +1,12 @@
+TEMPLATE = aux
+SOURCES += empty.cpp
+OBJECTS_DIR = obj
+QMAKE_CXXFLAGS += -MD
+
+test.commands = test -f $$OBJECTS_DIR/empty.d && test ! -f empty.d && touch $$basename(PWD)
+test.depends = $$OBJECTS_DIR/empty.o
+QMAKE_EXTRA_TARGETS += test
+
+default.target = all
+default.depends += test
+QMAKE_EXTRA_TARGETS += default
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (109903 => 109904)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-06 12:28:57 UTC (rev 109903)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-06 12:34:05 UTC (rev 109904)
@@ -28,8 +28,19 @@
pro_file_name = $$basename(_PRO_FILE_)
!equals(pro_file_name, configure.pro): QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
-load(default_pre) # Load Qt's defaults after we've resolved the build directory
+# Load Qt's defaults after we've resolved the build directory. This will also
+# run syncqt if there is a sync.profile in the $$_PRO_FILE_PWD_
+load(default_pre)
+# Load results of config tests (only supported in Qt 5)
+haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
+
+unix:config_test_gccdepends {
+# We have a compiler that supports the -MD option (and neither
+# teambuilder nor icecream is messing up the .d file output).
+CONFIG += GNUmake gcc_MD_depends
+}
+
equals(OUT_PWD, $${ROOT_BUILD_DIR}) {
!recursive_include:CONFIG += root_project_file
BUILD_ROOT_RELATIVE_TO_OUT_PWD = .
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109903 => 109904)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:28:57 UTC (rev 109903)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:
[webkit-changes] [109909] trunk/Tools
Title: [109909] trunk/Tools
Revision 109909
Author ves...@webkit.org
Date 2012-03-06 05:25:21 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Revert r109900, it was completly busted
HAVE_FOO does _not_ have a WTF_ prefix, go figure.
We still leave in the HAVE(FOO) in QtInitializeTestFonts.cpp, instead
of manual define checks.
Reviewed by Ossy.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Tools/ChangeLog (109908 => 109909)
--- trunk/Tools/ChangeLog 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/ChangeLog 2012-03-06 13:25:21 UTC (rev 109909)
@@ -1,3 +1,19 @@
+2012-03-06 Tor Arne Vestbø
+
+[Qt] Revert r109900, it was completly busted
+
+HAVE_FOO does _not_ have a WTF_ prefix, go figure.
+
+We still leave in the HAVE(FOO) in QtInitializeTestFonts.cpp, instead
+of manual define checks.
+
+Reviewed by Ossy.
+
+* DumpRenderTree/qt/DumpRenderTree.pro:
+* QtTestBrowser/QtTestBrowser.pro:
+* WebKitTestRunner/InjectedBundle/Target.pri:
+* qmake/mkspecs/features/features.prf:
+
2012-03-05 Tor Arne Vestbø
[Qt] Use config test to determine if the compiler supports -MD
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (109908 => 109909)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 13:25:21 UTC (rev 109909)
@@ -23,7 +23,7 @@
macx: QT += xml
haveQt(5): QT += widgets printsupport
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
HEADERS += \
$$PWD/../WorkQueue.h \
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (109908 => 109909)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 13:25:21 UTC (rev 109909)
@@ -50,7 +50,7 @@
macx:QT += xml
haveQt(5): QT += printsupport widgets
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
contains(QT_CONFIG, opengl) {
QT += opengl
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (109908 => 109909)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 13:25:21 UTC (rev 109909)
@@ -58,7 +58,7 @@
CONFIG += plugin qtwebkit rpath
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109908 => 109909)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 13:25:21 UTC (rev 109909)
@@ -45,12 +45,12 @@
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
haveQt(5) {
contains(config_test_fontconfig, yes):!mac {
-DEFINES += WTF_HAVE_FONTCONFIG=1
+DEFINES += HAVE_FONTCONFIG=1
}
} else {
# Qt 4
unix:!mac:!embedded {
-DEFINES += WTF_HAVE_FONTCONFIG=1
+DEFINES += HAVE_FONTCONFIG=1
}
}
@@ -137,7 +137,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += WTF_HAVE_QSTYLE=1
+haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
# WebGL support
contains(QT_CONFIG, opengl):!win32-* {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110199] trunk
Title: [110199] trunk
Revision 110199
Author ves...@webkit.org
Date 2012-03-08 13:49:16 -0800 (Thu, 08 Mar 2012)
Log Message
[Qt] Prospective Windows build fix
Don't assume that windows-builds will always run inside a cmd.exe shell.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/DerivedSources.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf
Diff
Modified: trunk/Source/WebCore/ChangeLog (110198 => 110199)
--- trunk/Source/WebCore/ChangeLog 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Source/WebCore/ChangeLog 2012-03-08 21:49:16 UTC (rev 110199)
@@ -1,3 +1,11 @@
+2012-03-08 Tor Arne Vestbø
+
+[Qt] Prospective Windows build fix
+
+Don't assume that windows-builds will always run inside a cmd.exe shell.
+
+* DerivedSources.pri:
+
2012-03-08 Vivek Galatage
Web Inspector: Creating a selector for class names with trailing spaces results with two dots instead of one
Modified: trunk/Source/WebCore/DerivedSources.pri (110198 => 110199)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-08 21:49:16 UTC (rev 110199)
@@ -672,8 +672,8 @@
preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT
# FIXME : We need to use only perl at some point.
EOC = $$escape_expand(\\n\\t)
-unix: preprocessIdls.commands = echo -n > $$IDL_FILES_TMP $$EOC
-else: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
+win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
+else: preprocessIdls.commands = echo -n > $$IDL_FILES_TMP $$EOC
for(binding, IDL_BINDINGS) {
preprocessIdls.commands += echo $$binding >> $$IDL_FILES_TMP $$EOC
}
Modified: trunk/Tools/ChangeLog (110198 => 110199)
--- trunk/Tools/ChangeLog 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Tools/ChangeLog 2012-03-08 21:49:16 UTC (rev 110199)
@@ -1,3 +1,11 @@
+2012-03-08 Tor Arne Vestbø
+
+[Qt] Prospective Windows build fix
+
+Don't assume that windows-builds will always run inside a cmd.exe shell.
+
+* qmake/mkspecs/features/default_pre.prf:
+
2012-03-08 Dan Bernstein
Dashboard regions should not be in device space
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (110198 => 110199)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-08 21:40:32 UTC (rev 110198)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-08 21:49:16 UTC (rev 110199)
@@ -53,31 +53,25 @@
BUILD_ROOT_RELATIVE_TO_OUT_PWD = $$join(BUILD_ROOT_RELATIVE_TO_OUT_PWD, $${QMAKE_DIR_SEP})
}
-# Make sure QMAKEPATH is set for recursive targets
+# Try to detect if we're running under Windows cmd.exe or not
win32* {
pwd = $$(PWD) # Normally empty for cmd.exe
-is_building_under_cygwin = $$find(pwd, ^/)
-!isEmpty(is_building_under_cygwin) {
-QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
-} else {
-QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
-}
-} else {
-QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+pwd_starts_with_slash = $$find(pwd, ^/)
+isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell
}
+# Make sure QMAKEPATH is set for recursive targets
+win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
+else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+
# Default location of generated sources
GENERATED_SOURCES_DESTDIR = generated
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
ESCAPE = ""
-win32-msvc* {
+win_cmd_shell {
ESCAPE = "^"
-} else:win32-g++*:isEmpty(QMAKE_SH) {
-# MinGW's make will run makefile commands using sh, even if make
-# was run from the Windows shell, if it finds sh in the path.
-ESCAPE = "^"
} else {
QUOTE = "\'"
DOUBLE_ESCAPED_QUOTE = "\\\'"
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110202] trunk/Source/WebCore
Title: [110202] trunk/Source/WebCore
Revision 110202
Author ves...@webkit.org
Date 2012-03-08 14:00:19 -0800 (Thu, 08 Mar 2012)
Log Message
Prospective build fix for Qt minimal after r110191
https://bugs.webkit.org/show_bug.cgi?id=80338
* testing/Internals.cpp:
(WebCore):
* testing/Internals.h:
(Internals):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/testing/Internals.cpp
trunk/Source/WebCore/testing/Internals.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (110201 => 110202)
--- trunk/Source/WebCore/ChangeLog 2012-03-08 22:00:00 UTC (rev 110201)
+++ trunk/Source/WebCore/ChangeLog 2012-03-08 22:00:19 UTC (rev 110202)
@@ -1,5 +1,16 @@
2012-03-08 Tor Arne Vestbø
+Prospective build fix for Qt minimal after r110191
+
+https://bugs.webkit.org/show_bug.cgi?id=80338
+
+* testing/Internals.cpp:
+(WebCore):
+* testing/Internals.h:
+(Internals):
+
+2012-03-08 Tor Arne Vestbø
+
[Qt] Prospective Windows build fix
Don't assume that windows-builds will always run inside a cmd.exe shell.
Modified: trunk/Source/WebCore/testing/Internals.cpp (110201 => 110202)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-03-08 22:00:00 UTC (rev 110201)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-03-08 22:00:19 UTC (rev 110202)
@@ -337,6 +337,7 @@
return ClientRect::create(renderer->absoluteBoundingBoxRectIgnoringTransforms());
}
+#if ENABLE(INSPECTOR)
PassRefPtr Internals::inspectorHighlightRects(Document* document, ExceptionCode& ec)
{
if (!document || !document->page() || !document->page()->inspectorController()) {
@@ -348,6 +349,7 @@
document->page()->inspectorController()->getHighlight(&highlight);
return ClientRectList::create(highlight.quads);
}
+#endif
unsigned Internals::markerCountForNode(Node* node, const String& markerType, ExceptionCode& ec)
{
Modified: trunk/Source/WebCore/testing/Internals.h (110201 => 110202)
--- trunk/Source/WebCore/testing/Internals.h 2012-03-08 22:00:00 UTC (rev 110201)
+++ trunk/Source/WebCore/testing/Internals.h 2012-03-08 22:00:19 UTC (rev 110202)
@@ -89,7 +89,9 @@
PassRefPtr boundingBox(Element*, ExceptionCode&);
+#if ENABLE(INSPECTOR)
PassRefPtr inspectorHighlightRects(Document*, ExceptionCode&);
+#endif
unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
PassRefPtr markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110205] trunk/Source/WebCore
Title: [110205] trunk/Source/WebCore
Revision 110205
Author ves...@webkit.org
Date 2012-03-08 14:09:53 -0800 (Thu, 08 Mar 2012)
Log Message
[Qt] Try to fix the Snow Leopard build
If the build is running under sh, echo -n does not empty the file.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/DerivedSources.pri
Diff
Modified: trunk/Source/WebCore/ChangeLog (110204 => 110205)
--- trunk/Source/WebCore/ChangeLog 2012-03-08 22:03:09 UTC (rev 110204)
+++ trunk/Source/WebCore/ChangeLog 2012-03-08 22:09:53 UTC (rev 110205)
@@ -1,5 +1,13 @@
2012-03-08 Tor Arne Vestbø
+[Qt] Try to fix the Snow Leopard build
+
+If the build is running under sh, echo -n does not empty the file.
+
+* DerivedSources.pri:
+
+2012-03-08 Tor Arne Vestbø
+
Prospective build fix for Qt minimal after r110191
https://bugs.webkit.org/show_bug.cgi?id=80338
Modified: trunk/Source/WebCore/DerivedSources.pri (110204 => 110205)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-08 22:03:09 UTC (rev 110204)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-08 22:09:53 UTC (rev 110205)
@@ -673,7 +673,7 @@
# FIXME : We need to use only perl at some point.
EOC = $$escape_expand(\\n\\t)
win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
-else: preprocessIdls.commands = echo -n > $$IDL_FILES_TMP $$EOC
+else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC
for(binding, IDL_BINDINGS) {
preprocessIdls.commands += echo $$binding >> $$IDL_FILES_TMP $$EOC
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110269] trunk/Source/WebCore
Title: [110269] trunk/Source/WebCore Revision 110269 Author ves...@webkit.org Date 2012-03-08 23:30:51 -0800 (Thu, 08 Mar 2012) Log Message [Qt] Fix Qt minimal build Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/testing/Internals.idl Diff Modified: trunk/Source/WebCore/ChangeLog (110268 => 110269) --- trunk/Source/WebCore/ChangeLog 2012-03-09 07:21:50 UTC (rev 110268) +++ trunk/Source/WebCore/ChangeLog 2012-03-09 07:30:51 UTC (rev 110269) @@ -1,3 +1,9 @@ +2012-03-08 Tor Arne Vestbø + +[Qt] Fix Qt minimal build + +* testing/Internals.idl: + 2012-03-08 James Robinson [chromium] Remove dead CoreGraphics code from chromium compositor implementation Modified: trunk/Source/WebCore/testing/Internals.idl (110268 => 110269) --- trunk/Source/WebCore/testing/Internals.idl 2012-03-09 07:21:50 UTC (rev 110268) +++ trunk/Source/WebCore/testing/Internals.idl 2012-03-09 07:30:51 UTC (rev 110269) @@ -64,7 +64,9 @@ ClientRect boundingBox(in Element element) raises(DOMException); +#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR ClientRectList inspectorHighlightRects(in Document document) raises (DOMException); +#endif unsigned long markerCountForNode(in Node node, in DOMString markerType) raises(DOMException); Range markerRangeForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110436] trunk
Title: [110436] trunk
Revision 110436
Author ves...@webkit.org
Date 2012-03-12 09:39:38 -0700 (Mon, 12 Mar 2012)
Log Message
[Qt] Make sure we set the right library version for Qt 4
r110272 accedentally pruned the variable that ensures this.
Reviewed by Simon Hausmann.
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
Diff
Modified: trunk/ChangeLog (110435 => 110436)
--- trunk/ChangeLog 2012-03-12 16:06:15 UTC (rev 110435)
+++ trunk/ChangeLog 2012-03-12 16:39:38 UTC (rev 110436)
@@ -1,3 +1,13 @@
+2012-03-12 Tor Arne Vestbø
+
+[Qt] Make sure we set the right library version for Qt 4
+
+r110272 accedentally pruned the variable that ensures this.
+
+Reviewed by Simon Hausmann.
+
+* Source/api.pri:
+
2012-03-10 Ryosuke Niwa
Increment the perf-o-matic app version.
Modified: trunk/Source/api.pri (110435 => 110436)
--- trunk/Source/api.pri 2012-03-12 16:06:15 UTC (rev 110435)
+++ trunk/Source/api.pri 2012-03-12 16:39:38 UTC (rev 110436)
@@ -103,6 +103,7 @@
}
}
} else {
+VERSION = $$QT_VERSION
DESTDIR = $$WEBKIT_DESTDIR
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110457] trunk/Tools
Title: [110457] trunk/Tools Revision 110457 Author ves...@webkit.org Date 2012-03-12 12:44:16 -0700 (Mon, 12 Mar 2012) Log Message [Qt] Expose location of WebKit's bin and imports dir through module file Reviewed by Andreas Kling. Modified Paths trunk/Tools/ChangeLog trunk/Tools/qmake/qt_webkit.pri Diff Modified: trunk/Tools/ChangeLog (110456 => 110457) --- trunk/Tools/ChangeLog 2012-03-12 19:24:45 UTC (rev 110456) +++ trunk/Tools/ChangeLog 2012-03-12 19:44:16 UTC (rev 110457) @@ -1,3 +1,11 @@ +2012-03-12 Tor Arne Vestbø + +[Qt] Expose location of WebKit's bin and imports dir through module file + +Reviewed by Andreas Kling. + +* qmake/qt_webkit.pri: + 2012-03-12 Andras Becsi [Qt][WK2] Add support for rudimentary scroll indicators in MiniBrowser Modified: trunk/Tools/qmake/qt_webkit.pri (110456 => 110457) --- trunk/Tools/qmake/qt_webkit.pri 2012-03-12 19:24:45 UTC (rev 110456) +++ trunk/Tools/qmake/qt_webkit.pri 2012-03-12 19:44:16 UTC (rev 110457) @@ -6,7 +6,9 @@ QT.webkit.VERSION = 5.0.0 QT.webkit.name = QtWebKit +QT.webkit.bins = $$QT_MODULE_BIN_BASE QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit +QT.webkit.imports = $$QT_MODULE_IMPORT_BASE QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION QT.webkit.sources = $$QT_MODULE_BASE QT.webkit.libs = $$QT_MODULE_LIB_BASE ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110458] trunk/Tools
Title: [110458] trunk/Tools
Revision 110458
Author ves...@webkit.org
Date 2012-03-12 12:44:37 -0700 (Mon, 12 Mar 2012)
Log Message
[Qt] Use right construct to detect config_test_gccdepends
Reviewed by Andreas Kling.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf
Diff
Modified: trunk/Tools/ChangeLog (110457 => 110458)
--- trunk/Tools/ChangeLog 2012-03-12 19:44:16 UTC (rev 110457)
+++ trunk/Tools/ChangeLog 2012-03-12 19:44:37 UTC (rev 110458)
@@ -1,5 +1,13 @@
2012-03-12 Tor Arne Vestbø
+[Qt] Use right construct to detect config_test_gccdepends
+
+Reviewed by Andreas Kling.
+
+* qmake/mkspecs/features/default_pre.prf:
+
+2012-03-12 Tor Arne Vestbø
+
[Qt] Expose location of WebKit's bin and imports dir through module file
Reviewed by Andreas Kling.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (110457 => 110458)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-12 19:44:16 UTC (rev 110457)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-12 19:44:37 UTC (rev 110458)
@@ -44,7 +44,7 @@
# Load results of config tests (only supported in Qt 5)
haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
-unix:config_test_gccdepends {
+unix:contains(config_test_gccdepends, yes) {
# We have a compiler that supports the -MD option (and neither
# teambuilder nor icecream is messing up the .d file output).
CONFIG += GNUmake gcc_MD_depends
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110575] trunk/Tools
Title: [110575] trunk/Tools
Revision 110575
Author ves...@webkit.org
Date 2012-03-13 09:33:37 -0700 (Tue, 13 Mar 2012)
Log Message
[Qt] Tweak minibrowser UI
Add some margins to the scroll indicators, and set a dark background
color so you see the page dimensions.
Reviewed by Antonio Gomes.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml
Diff
Modified: trunk/Tools/ChangeLog (110574 => 110575)
--- trunk/Tools/ChangeLog 2012-03-13 16:11:17 UTC (rev 110574)
+++ trunk/Tools/ChangeLog 2012-03-13 16:33:37 UTC (rev 110575)
@@ -1,3 +1,15 @@
+2012-03-13 Tor Arne Vestbø
+
+[Qt] Tweak minibrowser UI
+
+Add some margins to the scroll indicators, and set a dark background
+color so you see the page dimensions.
+
+Reviewed by Antonio Gomes.
+
+* MiniBrowser/qt/qml/BrowserWindow.qml:
+* MiniBrowser/qt/qml/ScrollIndicator.qml:
+
2012-03-13 ChangSeok Oh
[EFL] [DRT] Implement scheduleAsynchronousKeyDown.
Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (110574 => 110575)
--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-03-13 16:11:17 UTC (rev 110574)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-03-13 16:33:37 UTC (rev 110575)
@@ -34,6 +34,7 @@
// Do not define anchors or an initial size here! This would mess up with QSGView::SizeRootObjectToView.
property alias webview: webView
+color: "#333"
signal pageTitleChanged(string title)
signal newWindow(string url)
Modified: trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml (110574 => 110575)
--- trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml 2012-03-13 16:11:17 UTC (rev 110574)
+++ trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml 2012-03-13 16:33:37 UTC (rev 110575)
@@ -31,7 +31,10 @@
id: root
z: 1
-anchors.fill: parent
+anchors {
+fill: parent
+margins: 5
+}
property Flickable flickableItem
@@ -58,7 +61,7 @@
radius: 10
color: "black"
border.color: "gray"
-border.width: 2
+border.width: 1
opacity: 0.5
smooth: true
@@ -104,7 +107,7 @@
radius: 10
color: "black"
border.color: "gray"
-border.width: 2
+border.width: 1
opacity: 0.5
smooth: true;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110702] trunk
Title: [110702] trunk
Revision 110702
Author ves...@webkit.org
Date 2012-03-14 08:28:34 -0700 (Wed, 14 Mar 2012)
Log Message
[Qt] Deal with multiple paths in QMAKE_EXTRA_MODULE_FORWARDS
Reviewed by Simon Hausmann.
Modified Paths
trunk/ChangeLog
trunk/Source/api.pri
Diff
Modified: trunk/ChangeLog (110701 => 110702)
--- trunk/ChangeLog 2012-03-14 15:24:13 UTC (rev 110701)
+++ trunk/ChangeLog 2012-03-14 15:28:34 UTC (rev 110702)
@@ -1,3 +1,11 @@
+2012-03-14 Tor Arne Vestbø
+
+[Qt] Deal with multiple paths in QMAKE_EXTRA_MODULE_FORWARDS
+
+Reviewed by Simon Hausmann.
+
+* Source/api.pri:
+
2012-03-14 Max Vujovic
GTK 32-bit Linux Release build failing after r110580 (from bug 80338)
Modified: trunk/Source/api.pri (110701 => 110702)
--- trunk/Source/api.pri 2012-03-14 15:24:13 UTC (rev 110701)
+++ trunk/Source/api.pri 2012-03-14 15:28:34 UTC (rev 110702)
@@ -52,14 +52,28 @@
convenience_module_path = $${ROOT_BUILD_DIR}/modules
module_filename = $$basename(QT.webkit.module_pri)
-make_module_fwd_convenience.target = $$convenience_module_path/$$module_filename
-make_module_fwd_convenience.commands = $$QMAKE_MKDIR $$convenience_module_path \
-&& echo \"include($$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename)\" > $$convenience_module_path/$$module_filename
-make_module_fwd_convenience.depends = $$QMAKE_EXTRA_MODULE_FORWARDS/$$module_filename
+# The QMAKE_EXTRA_MODULE_FORWARDS might contain more than one path,
+# so we iterate the paths and find one that matches our build dir.
+for(module_forward, QMAKE_EXTRA_MODULE_FORWARDS) {
+in_build_dir = $$find(module_forward, ^$${ROOT_BUILD_DIR})
+!isEmpty(in_build_dir) {
+webkit_module_forward = $$module_forward
+break()
+}
+}
-QMAKE_EXTRA_TARGETS += make_module_fwd_convenience
-DEFAULT_TARGETS += make_module_fwd_convenience
+isEmpty(webkit_module_forward) {
+warning(Could not resolve QMAKE_EXTRA_MODULE_FORWARDS path!)
+} else {
+make_module_fwd_convenience.target = $$convenience_module_path/$$module_filename
+make_module_fwd_convenience.commands = $$QMAKE_MKDIR $$convenience_module_path \
+&& echo \"include($$webkit_module_forward/$$module_filename)\" > $$convenience_module_path/$$module_filename
+make_module_fwd_convenience.depends = $$webkit_module_forward/$$module_filename
+QMAKE_EXTRA_TARGETS += make_module_fwd_convenience
+DEFAULT_TARGETS += make_module_fwd_convenience
+}
+
qt_developer_build {
# Copy the module forward file into Qt so that the module
# is immediately accessible.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [110993] trunk/Tools
Title: [110993] trunk/Tools
Revision 110993
Author ves...@webkit.org
Date 2012-03-16 05:46:40 -0700 (Fri, 16 Mar 2012)
Log Message
[Qt] Make gccdepends test aware of broken icecream deps generation
Icecream seems to build the files without passing -o to gcc with
the original destination path, which means the target name in the
dependency file is wrong.
Also, echo something to the final file instead of just touching it,
so it's not deleted on every build.
Reviewed by Simon Hausmann.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro
Diff
Modified: trunk/Tools/ChangeLog (110992 => 110993)
--- trunk/Tools/ChangeLog 2012-03-16 12:31:57 UTC (rev 110992)
+++ trunk/Tools/ChangeLog 2012-03-16 12:46:40 UTC (rev 110993)
@@ -1,3 +1,18 @@
+2012-03-16 Tor Arne Vestbø
+
+[Qt] Make gccdepends test aware of broken icecream deps generation
+
+Icecream seems to build the files without passing -o to gcc with
+the original destination path, which means the target name in the
+dependency file is wrong.
+
+Also, echo something to the final file instead of just touching it,
+so it's not deleted on every build.
+
+Reviewed by Simon Hausmann.
+
+* qmake/config.tests/gccdepends/gccdepends.pro:
+
2012-03-16 Kihong Kwon
Support for Battery Status API
Modified: trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro (110992 => 110993)
--- trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-03-16 12:31:57 UTC (rev 110992)
+++ trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-03-16 12:46:40 UTC (rev 110993)
@@ -1,10 +1,32 @@
TEMPLATE = aux
-SOURCES += empty.cpp
OBJECTS_DIR = obj
QMAKE_CXXFLAGS += -MD
-test.commands = test -f $$OBJECTS_DIR/empty.d && test ! -f empty.d && touch $$basename(PWD)
-test.depends = $$OBJECTS_DIR/empty.o
+base_filename = empty
+object_file = $$OBJECTS_DIR/$${base_filename}.o
+deps_filename = $${base_filename}.d
+
+SOURCES += $${base_filename}.cpp
+
+test.commands = \
+# Earlier teambuilder and icecream versions would not
+# respect the -o argument for the .d file, so the file
+# would end up in the root build dir.
+test ! -f $${deps_filename} && \
+\
+# But it should end up in the OBJECTS_DIR
+test -f $$OBJECTS_DIR/$${deps_filename} && \
+\
+# Icecream 0.9.7 and earlier does not ensure that the
+# target rule matches the path of the .o file, since
+# the file is compiled into the current dir and then
+# moved. Verify that we don't hit that case.
+grep -q \"$${object_file}:\" $$OBJECTS_DIR/$${deps_filename} && \
+\
+# If everything is all right we mark the test as succeeded
+echo success > $$basename(PWD)
+
+test.depends = $${object_file}
QMAKE_EXTRA_TARGETS += test
default.target = all
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [108981] trunk
Title: [108981] trunk
Revision 108981
Author ves...@webkit.org
Date 2012-02-27 03:30:29 -0800 (Mon, 27 Feb 2012)
Log Message
[Qt] Use USE() macro instead of ENABLE() for using the Qt image decoder
Reviewed by Kenneth Rohde Christiansen.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/WebCore.pri
trunk/Source/WebCore/platform/MIMETypeRegistry.cpp
trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h
trunk/Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf
Diff
Modified: trunk/Source/WebCore/ChangeLog (108980 => 108981)
--- trunk/Source/WebCore/ChangeLog 2012-02-27 11:13:44 UTC (rev 108980)
+++ trunk/Source/WebCore/ChangeLog 2012-02-27 11:30:29 UTC (rev 108981)
@@ -1,3 +1,21 @@
+2012-02-27 Tor Arne Vestbø
+
+[Qt] Use USE() macro instead of ENABLE() for using the Qt image decoder
+
+Reviewed by Kenneth Rohde Christiansen..
+
+* Target.pri:
+* WebCore.pri:
+* platform/MIMETypeRegistry.cpp:
+(WebCore::initializeSupportedImageMIMETypes):
+(WebCore::initializeSupportedImageMIMETypesForEncoding):
+* platform/image-decoders/ImageDecoder.h:
+(WebCore::ImageFrame::getAddr):
+(ImageFrame):
+* platform/image-decoders/qt/ImageFrameQt.cpp:
+(WebCore):
+(WebCore::ImageFrame::asNewNativeImage):
+
2012-02-27 MORITA Hajime
Removing , inside shadow DOM triggers assertion in updateListMarkerNumbers
Modified: trunk/Source/WebCore/Target.pri (108980 => 108981)
--- trunk/Source/WebCore/Target.pri 2012-02-27 11:13:44 UTC (rev 108980)
+++ trunk/Source/WebCore/Target.pri 2012-02-27 11:30:29 UTC (rev 108981)
@@ -3941,7 +3941,7 @@
page/PageSerializer.cpp
}
-contains(DEFINES, ENABLE_QT_IMAGE_DECODER=1) {
+contains(DEFINES, WTF_USE_QT_IMAGE_DECODER=1) {
HEADERS += platform/graphics/qt/ImageDecoderQt.h
SOURCES += platform/graphics/qt/ImageDecoderQt.cpp
} else {
Modified: trunk/Source/WebCore/WebCore.pri (108980 => 108981)
--- trunk/Source/WebCore/WebCore.pri 2012-02-27 11:13:44 UTC (rev 108980)
+++ trunk/Source/WebCore/WebCore.pri 2012-02-27 11:30:29 UTC (rev 108981)
@@ -204,7 +204,7 @@
LIBS += -lsqlite3
}
-contains(DEFINES, ENABLE_QT_IMAGE_DECODER=0) {
+contains(DEFINES, WTF_USE_QT_IMAGE_DECODER=0) {
INCLUDEPATH += \
$$SOURCE_DIR/platform/image-decoders/bmp \
$$SOURCE_DIR/platform/image-decoders/gif \
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (108980 => 108981)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2012-02-27 11:13:44 UTC (rev 108980)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2012-02-27 11:30:29 UTC (rev 108981)
@@ -39,7 +39,7 @@
#include
#include
#endif
-#if PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER)
+#if PLATFORM(QT) && USE(QT_IMAGE_DECODER)
#include
#include
#endif
@@ -229,7 +229,7 @@
supportedImageMIMETypes->remove("application/pdf");
supportedImageMIMETypes->remove("application/postscript");
-#elif PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER)
+#elif PLATFORM(QT) && USE(QT_IMAGE_DECODER)
QList formats = QImageReader::supportedImageFormats();
for (size_t i = 0; i < static_cast(formats.size()); ++i) {
#if ENABLE(SVG)
@@ -289,7 +289,7 @@
supportedImageMIMETypesForEncoding->add("image/jpeg");
supportedImageMIMETypesForEncoding->add("image/gif");
#endif
-#elif PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER)
+#elif PLATFORM(QT) && USE(QT_IMAGE_DECODER)
QList formats = QImageWriter::supportedImageFormats();
for (int i = 0; i < formats.size(); ++i) {
String mimeType = MIMETypeRegistry::getMIMETypeForExtension(formats.at(i).constData());
Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (108980 => 108981)
--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-02-27 11:13:44 UTC (rev 108980)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2012-02-27 11:30:29 UTC (rev 108981)
@@ -64,7 +64,7 @@
DisposeOverwritePrevious // Clear frame to previous framebuffer
// contents
};
-#if USE(SKIA) || (PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER))
+#if USE(SKIA) || (PLATFORM(QT) && USE(QT_IMAGE_DECODER))
typedef uint32_t PixelData;
#else
typedef unsigned PixelData;
@@ -140,7 +140,7 @@
{
#if USE(SKIA)
return m_bitmap.bitmap().getAddr32(x, y);
-#elif PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER)
+#elif PLATFORM(QT) && USE(QT_IMAGE_DECODER)
m_image = m_pixmap.toImage();
m_pixmap = QPixmap();
return reinterpret_cast_ptr(m_image.scanLine(y)) + x;
@@ -149,7 +149,7 @@
#endif
}
-#if PLATFORM(QT) && ENABLE(QT_IMAGE_DECODER)
+#if PLATFORM(QT) && USE(QT_IMAGE_DECODER)
void setPixmap(const QPixmap& pixmap);
#endif
@@ -190,7 +190,7
[webkit-changes] [108982] trunk/Source/WebCore
Title: [108982] trunk/Source/WebCore Revision 108982 Author ves...@webkit.org Date 2012-02-27 03:38:34 -0800 (Mon, 27 Feb 2012) Log Message [Qt] Remove page/PageSupplement.h from WebCore's Target.pri The file itself was removed in r108958. Reviewed by Kenneth Rohde Christiansen. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Target.pri Diff Modified: trunk/Source/WebCore/ChangeLog (108981 => 108982) --- trunk/Source/WebCore/ChangeLog 2012-02-27 11:30:29 UTC (rev 108981) +++ trunk/Source/WebCore/ChangeLog 2012-02-27 11:38:34 UTC (rev 108982) @@ -1,5 +1,15 @@ 2012-02-27 Tor Arne Vestbø +[Qt] Remove page/PageSupplement.h from WebCore's Target.pri + +The file itself was removed in r108958. + +Reviewed by Kenneth Rohde Christiansen. + +* Target.pri: + +2012-02-27 Tor Arne Vestbø + [Qt] Use USE() macro instead of ENABLE() for using the Qt image decoder Reviewed by Kenneth Rohde Christiansen.. Modified: trunk/Source/WebCore/Target.pri (108981 => 108982) --- trunk/Source/WebCore/Target.pri 2012-02-27 11:30:29 UTC (rev 108981) +++ trunk/Source/WebCore/Target.pri 2012-02-27 11:38:34 UTC (rev 108982) @@ -2086,7 +2086,6 @@ page/PageGroup.h \ page/PageGroupLoadDeferrer.h \ page/Page.h \ -page/PageSupplement.h \ page/PageVisibilityState.h \ page/PrintContext.h \ page/Screen.h \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
