Skip to content

Instantly share code, notes, and snippets.

View zenoalbisser's full-sized avatar

Zeno Albisser zenoalbisser

  • Nokia Qt Development Frameworks
  • Oslo
View GitHub Profile
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index b53c84e..f005c08 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -76,11 +76,8 @@
(WebKit::WebPageProxy::sendApplicationSchemeReply):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createNetworkingContext):
- * WebProcess/WebCoreSupport/qt/PagePointerWrapper.cpp: Added.
- (PagePointerWrapper::PagePointerWrapper):
commit 39f9d83869b5657c4f978747c166ff394f8f55cf
Author: Zeno Albisser <[email protected]>
Date: Wed Jan 4 12:10:46 2012 +0100
Change the QtWebKit Version to 2.2.2
diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h
index bd58b65..b82d0c6 100644
--- a/Source/WebKit/qt/Api/qwebkitglobal.h
+++ b/Source/WebKit/qt/Api/qwebkitglobal.h
commit 395f81f3a6ef133d321915105d99f12dbaececd4
Author: Zeno Albisser <[email protected]>
Date: Tue Dec 20 12:48:04 2011 +0100
Change the QtWebKit Version to 2.2.1
diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h
index 7ee56de..bd58b65 100644
--- a/Source/WebKit/qt/Api/qwebkitglobal.h
+++ b/Source/WebKit/qt/Api/qwebkitglobal.h
From 81ae9027b72dcf3635d2fb9f20e63d60b35d62e8 Mon Sep 17 00:00:00 2001
From: hjk <[email protected]>
Date: Tue Nov 22 14:50:34 2011 +0100
Subject: Re-apply change 81ae9027b72dcf3635d2fb9f20e63d60b35d62e8 by hjk
Webkit: Work around C++11 string literal source incompatibility.
ISO/IEC 14882 2.2 Phases of translations: "user defined string literals"
are recognized as single preprocessor token in Phase 3, left unchanged by
"...preprocessing executed" in Phase 4. Previously, there were no user
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index aa84fe5..cf0b174 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -80,6 +80,7 @@ QQuickWebViewPrivate::~QQuickWebViewPrivate()
// Note: we delay this initialization to make sure that QQuickWebView has its d-ptr in-place.
void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
{
+ Q_Q(QQuickWebView);
RefPtr<WebPageGroup> pageGroup;
commit 9c89f999989245da1d53a0fec712d5b09a0cf095
Author: Zeno Albisser <[email protected]>
Date: Thu Jan 12 15:04:46 2012 +0100
buildfix
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0a61114..493f8de 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
commit 2eae89feba23ac6e11ca6de4d28ac70d6438d631
Author: Zeno Albisser <[email protected]>
Date: Mon Jan 16 16:49:39 2012 +0100
fixes it :)
diff --git a/Source/WebKit2/Shared/WebLayerTreeInfo.h b/Source/WebKit2/Shared/WebLayerTreeInfo.h
index aae0ef0..cb7c9d7 100644
--- a/Source/WebKit2/Shared/WebLayerTreeInfo.h
+++ b/Source/WebKit2/Shared/WebLayerTreeInfo.h
#!/bin/bash
function break_here {
echo "Can we continue?"
# read aok
}
if [ $# -ne 1 ] ; then
echo "usage: $0 WEEKLY_QT5_HASH"
exit 0;
commit 0668b21b15566e4fa9ecb16c6628b87664365bad
Author: Zeno Albisser <[email protected]>
Date: Fri Jan 20 15:33:51 2012 +0100
mac buildfix
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f388863..f5f9239 100755
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
#!/bin/bash
function break_here {
echo "Can we continue?"
# read aok
}
if [ $# -lt 1 -o $# -gt 2 ] ; then
echo "usage: $0 WEEKLY_QT5_HASH [platform]"
exit 0;