Changeset 59614 in webkit

Timestamp:

May 17, 2010 10:43:28 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-17 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix compilation with QT_NO_COMBOBOX
​https://bugs.webkit.org/show_bug.cgi?id=38324

• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::createSelectPopup):
• WebCoreSupport/QtFallbackWebPopup.cpp:
• WebCoreSupport/QtFallbackWebPopup.h:

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• WebCoreSupport/QtFallbackWebPopup.cpp (modified) (2 diffs)
• WebCoreSupport/QtFallbackWebPopup.h (modified) (2 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-05-17  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix compilation with QT_NO_COMBOBOX
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        * WebCoreSupport/QtFallbackWebPopup.h:
+
 2010-05-17  Antti Koivisto  <koivisto@iki.fi>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -586 +586 @@
 #if defined(Q_WS_MAEMO_5)
     return new QtMaemoWebPopup;
+#elif !defined(QT_NO_COMBOBOX)
+    return new QtFallbackWebPopup;
 #else
-    return new QtFallbackWebPopup;
+    return result;
 #endif
 }

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -21 +21 @@
 #include "config.h"
 #include "QtFallbackWebPopup.h"
+
+#ifndef QT_NO_COMBOBOX
 
 #include "HostWindow.h"
@@ -226 +228 @@
 
 }
+
+#endif // QT_NO_COMBOBOX

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h

@@ -23 +23 @@
 #include "QtAbstractWebPopup.h"
 #include <QComboBox>
+
+#ifndef QT_NO_COMBOBOX
 
 QT_BEGIN_NAMESPACE
@@ -68 +70 @@
 }
 
+#endif // QT_NO_COMBOBOX
+
 #endif // QtFallbackWebPopup_h