[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3207bc08fab345ce9ead31ef417ef0ea850aa6fd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 16:51:52 2010 +0000

    2010-11-19  Sam Magnuson  <smagnuso at gmail.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Compile with QT_NO_UNDOCOMMAND
            https://bugs.webkit.org/show_bug.cgi?id=49752
    
            * WebCoreSupport/EditCommandQt.cpp:
            (EditCommandQt::EditCommandQt):
            * WebCoreSupport/EditCommandQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7c0fb8e..c41d342 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-19  Sam Magnuson  <smagnuso at gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Compile with QT_NO_UNDOCOMMAND
+        https://bugs.webkit.org/show_bug.cgi?id=49752
+
+        * WebCoreSupport/EditCommandQt.cpp:
+        (EditCommandQt::EditCommandQt):
+        * WebCoreSupport/EditCommandQt.h:
+
 2010-11-19  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/EditCommandQt.cpp b/WebKit/qt/WebCoreSupport/EditCommandQt.cpp
index 9c4ff87..4b820a9 100644
--- a/WebKit/qt/WebCoreSupport/EditCommandQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditCommandQt.cpp
@@ -22,15 +22,20 @@
 
 using namespace WebCore;
 
-EditCommandQt::EditCommandQt(WTF::RefPtr<EditCommand> cmd, QUndoCommand *parent)
-:
 #ifndef QT_NO_UNDOCOMMAND
-    QUndoCommand(parent),
-#endif
-    m_cmd(cmd), m_first(true)
+EditCommandQt::EditCommandQt(WTF::RefPtr<EditCommand> cmd, QUndoCommand *parent)
+    : QUndoCommand(parent)
+    , m_cmd(cmd)
+    , m_first(true)
 {
 }
-
+#else
+EditCommandQt::EditCommandQt(WTF::RefPtr<EditCommand> cmd)
+    : m_cmd(cmd)
+    , m_first(true)
+{
+}
+#endif
 
 EditCommandQt::~EditCommandQt()
 {
diff --git a/WebKit/qt/WebCoreSupport/EditCommandQt.h b/WebKit/qt/WebCoreSupport/EditCommandQt.h
index e03b9b2..47dc67c 100644
--- a/WebKit/qt/WebCoreSupport/EditCommandQt.h
+++ b/WebKit/qt/WebCoreSupport/EditCommandQt.h
@@ -30,7 +30,11 @@ class EditCommandQt
 #endif
 {
     public:
+#ifndef QT_NO_UNDOCOMMAND
         EditCommandQt(WTF::RefPtr<WebCore::EditCommand> cmd, QUndoCommand *parent = 0);
+#else
+        EditCommandQt(WTF::RefPtr<WebCore::EditCommand> cmd);
+#endif
         ~EditCommandQt();
 
         void redo();

-- 
WebKit Debian packaging