diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 16:43:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 16:43:58 (GMT) |
commit | 912e7eec85d655f579796b8d930ae5c5f29cffe0 (patch) | |
tree | ddaf73a5f2256cd9593e43eb3dd6b75680da624f | |
parent | 13283816b29d2d46a733f99400287c8793666984 (diff) | |
parent | 10cce072be3619bfce802e0aae70e043437a1e79 (diff) | |
download | Qt-912e7eec85d655f579796b8d930ae5c5f29cffe0.zip Qt-912e7eec85d655f579796b8d930ae5c5f29cffe0.tar.gz Qt-912e7eec85d655f579796b8d930ae5c5f29cffe0.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
-rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/ChangeLog | 8 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/ChangeLog | 9 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/WebCore.pri | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/inspector/InspectorWorkerAgent.cpp | 4 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebKit.pri | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
7 files changed, 23 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 12a28b8..3868886 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -52a11cec052aa40d3bbc06861be1177b649b4a99 +83439de78841f9569ad78e3a84b7b888337b5d18 diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index bbaf26d..82dc1fb 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,11 @@ +2011-12-08 Zeno Albisser <zeno@webkit.org> + + Disable -Werror for standalone packages. + + Reviewed by Simon Hausmann. + + * Source/WebKit.pri: + 2011-11-09 Zeno Albisser <zeno.albisser@nokia.com> [Qt] Unreviewed: Fix build on Mac. diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog index ead97bd..4c6a7c1 100644 --- a/src/3rdparty/webkit/Source/WebCore/ChangeLog +++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2011-06-10 Konstantin Tokarev <ktokarev@smartlabs.tv> + + Reviewed by Joseph Pecoraro. + + Fixed build with enabled workers and disabled inspector + https://bugs.webkit.org/show_bug.cgi?id=62461 + + * inspector/InspectorWorkerAgent.cpp: Added inspector guard + 2011-11-01 Zeno Albisser <zeno.albisser@nokia.com> [Qt] bad codegen, pointer diff in JSC::JSCallbackConstructor::JSCallbackConstructor diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index d8ba8a6..00357a1 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -153,7 +153,7 @@ symbian { CONFIG += do_not_build_as_thumb CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 - # Symbian plugin support. + # Symbian plugin support LIBS += -lefsrv !CONFIG(QTDIR_build) { diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/InspectorWorkerAgent.cpp index b875f0f..6288a88 100644 --- a/src/3rdparty/webkit/Source/WebCore/inspector/InspectorWorkerAgent.cpp +++ b/src/3rdparty/webkit/Source/WebCore/inspector/InspectorWorkerAgent.cpp @@ -30,7 +30,7 @@ #include "config.h" -#if ENABLE(WORKERS) +#if ENABLE(WORKERS) && ENABLE(INSPECTOR) #include "InspectorWorkerAgent.h" @@ -128,4 +128,4 @@ void InspectorWorkerAgent::didStartWorkerContext(WorkerContextProxy* workerConte } // namespace WebCore -#endif // ENABLE(WORKERS) +#endif // ENABLE(WORKERS) && ENABLE(INSPECTOR) diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index c469d1a..5080119 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -102,7 +102,7 @@ CONFIG -= warn_on # Treat warnings as errors on x86/Linux/GCC linux-g++* { - isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror + !CONFIG(standalone_package):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)) { diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 750e7e7..a08cc05 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 52a11cec052aa40d3bbc06861be1177b649b4a99 + 83439de78841f9569ad78e3a84b7b888337b5d18 |