[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 75b3d3a0a4633bdd58bec3f3dfbc3eacf98e4b0b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 11:16:17 2009 +0000

    Compile fix with namespaced Qt.
    
    Patch by Andre Poenitz <andre.poenitz at trolltech.com> on 2009-09-28
    Reviewed by Simon Hausmann.
    
    * Api/qwebinspector_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebinspector_p.h b/WebKit/qt/Api/qwebinspector_p.h
index b7af4f8..4d327cc 100644
--- a/WebKit/qt/Api/qwebinspector_p.h
+++ b/WebKit/qt/Api/qwebinspector_p.h
@@ -20,10 +20,12 @@
 #ifndef QWEBINSPECTOR_P_H
 #define QWEBINSPECTOR_P_H
 
+QT_BEGIN_NAMESPACE
 class QSize;
+class QWidget;
+QT_END_NAMESPACE
 class QWebInspector;
 class QWebPage;
-class QWidget;
 
 class QWebInspectorPrivate {
 public:
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d1c3618..a8b5c38 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-28  Andre Poenitz  <andre.poenitz at trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Compile fix with namespaced Qt.
+
+        * Api/qwebinspector_p.h:
+
 2009-09-27  Joe Ligman  <joseph.ligman at mindspring.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging