Tor Arne Vestbø torarnv
torarnv
/ gist:125796
Created
June 8, 2009 12:52
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h | |
| index 18ae697..2f2e5e6 100644 | |
| --- a/WebKit/qt/Api/qwebframe.h | |
| +++ b/WebKit/qt/Api/qwebframe.h | |
| @@ -1,5 +1,5 @@ | |
| /* | |
| - Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | |
| + Copyright (C) 2008,2009 Nokia Corporation and/or its subsidiary(-ies) | |
| Copyright (C) 2007 Staikos Computing Services Inc. | |
torarnv
/ patch.diff
Created
June 10, 2009 15:17
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 97c91cd031cee398b81061bdb9dfbf34db6dc23c | |
| Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | |
| Date: Wed Jun 10 17:16:08 2009 +0200 | |
| 2009-06-10 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | |
| Reviewed by Simon Hausmann. | |
| [Qt] Use absolute path for install_name on Mac |
torarnv
/ patch.diff
Created
June 10, 2009 15:23
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/webkittrunk.pri w/webkittrunk.pri | |
| index c08131f..58f2be4 100644 | |
| --- i/webkittrunk.pri | |
| +++ w/webkittrunk.pri | |
| @@ -8,19 +8,18 @@ webkit_trunk { | |
| WEBKITDIR = $$(WEBKITDIR) | |
| WEBKITBRANCH = $$(WEBKITBRANCH) | |
| isEmpty(WEBKITBRANCH) { | |
| - CONFIG(release):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Release/lib | |
| - CONFIG(debug):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Debug/lib |
torarnv
/ patch.diff
Created
June 11, 2009 13:57
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/WebCore/WebCore.pro w/WebCore/WebCore.pro | |
| index 1e58e47..7c0a395 100644 | |
| --- i/WebCore/WebCore.pro | |
| +++ w/WebCore/WebCore.pro | |
| @@ -149,6 +149,12 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { | |
| DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 | |
| +# Used to compute defaults for the build-webkit script | |
| +CONFIG(compute_defaults) { |
torarnv
/ patch.diff
Created
June 11, 2009 14:26
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/WebCore/WebCore.pro w/WebCore/WebCore.pro | |
| index 1e58e47..7c0a395 100644 | |
| --- i/WebCore/WebCore.pro | |
| +++ w/WebCore/WebCore.pro | |
| @@ -149,6 +149,12 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { | |
| DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 | |
| +# Used to compute defaults for the build-webkit script | |
| +CONFIG(compute_defaults) { |
torarnv
/ patch.diff
Created
June 12, 2009 07:02
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/WebCore/WebCore.pro w/WebCore/WebCore.pro | |
| index 1e58e47..7c0a395 100644 | |
| --- i/WebCore/WebCore.pro | |
| +++ w/WebCore/WebCore.pro | |
| @@ -149,6 +149,12 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { | |
| DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 | |
| +# Used to compute defaults for the build-webkit script | |
| +CONFIG(compute_defaults) { |
torarnv
/ patch.diff
Created
June 12, 2009 07:14
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/WebCore/WebCore.pro w/WebCore/WebCore.pro | |
| index 1e58e47..7c0a395 100644 | |
| --- i/WebCore/WebCore.pro | |
| +++ w/WebCore/WebCore.pro | |
| @@ -149,6 +149,12 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { | |
| DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 | |
| +# Used to compute defaults for the build-webkit script | |
| +CONFIG(compute_defaults) { |
torarnv
/ patch.diff
Created
June 12, 2009 09:34
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/WebCore/WebCore.pro w/WebCore/WebCore.pro | |
| index 1e58e47..7c0a395 100644 | |
| --- i/WebCore/WebCore.pro | |
| +++ w/WebCore/WebCore.pro | |
| @@ -149,6 +149,12 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { | |
| DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 | |
| +# Used to compute defaults for the build-webkit script | |
| +CONFIG(compute_defaults) { |
torarnv
/ patch.diff
Created
June 12, 2009 11:04
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/configure w/configure | |
| index 58ab08c..c88003b 100755 | |
| --- i/configure | |
| +++ w/configure | |
| @@ -2106,7 +2106,7 @@ fi | |
| # symlink files from src/gui/embedded neccessary to build qvfb | |
| if [ "$CFG_DEV" = "yes" ]; then | |
| for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do | |
| - dest="${relpath}/tools/qvfb/${f}" | |
| + dest="${outpath}/tools/qvfb/${f}" |
torarnv
/ patch.diff
Created
June 12, 2009 11:06
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/configure w/configure | |
| index 58ab08c..e1b3777 100755 | |
| --- i/configure | |
| +++ w/configure | |
| @@ -2105,8 +2105,9 @@ fi | |
| # symlink files from src/gui/embedded neccessary to build qvfb | |
| if [ "$CFG_DEV" = "yes" ]; then | |
| + mkdir -p "$outpath/tools/qvfb" | |
| for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do |