gistfile1.txt

diff --git a/ChangeLog b/ChangeLog
index bbaf26d..526b788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-08  Zeno Albisser  <zeno@webkit.org>
+
+        Disable -Werror for standalone packages.
+
+        Reviewed by NOBODY (OOPS!).
+
+        * Source/WebKit.pri:
+
 2011-11-09  Zeno Albisser  <zeno.albisser@nokia.com>
 
         [Qt] Unreviewed: Fix build on Mac.
diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index c469d1a..5080119 100644
--- a/Source/WebKit.pri
+++ b/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)) {