Changeset 60609 in webkit

Timestamp:

Jun 3, 2010 12:03:05 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-02 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Shinichiro Hamaji.

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

• Api/qwebpage.cpp: (QWebPage::event):
• Api/qwebpage_p.h:
• WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::openInspectorFrontend):

2010-06-02 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Shinichiro Hamaji.

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

• QtTestBrowser/main.cpp: (LauncherWindow::init):

Location:

trunk

Files:

• WebKit/qt/Api/qwebpage.cpp (modified) (3 diffs)
• WebKit/qt/Api/qwebpage_p.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/QtTestBrowser/main.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1204 +1204 @@
 }
 
+#ifndef QT_NO_PROPERTIES
 void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
 {
@@ -1258 +1259 @@
 #endif
 }
+#endif
 
 void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
@@ -2642 +2644 @@
         break;
 #endif
+#ifndef QT_NO_PROPERTIES
     case QEvent::DynamicPropertyChange:
         d->dynamicPropertyChangeEvent(static_cast<QDynamicPropertyChangeEvent*>(ev));
         break;
+#endif
     default:
         return QObject::event(ev);

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -113 +113 @@
     void inputMethodEvent(QInputMethodEvent*);
 
+#ifndef QT_NO_PROPERTIES
     void dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent*);
+#endif
 
     void shortcutOverrideEvent(QKeyEvent*);

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-06-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        [Qt] Fix compilation with QT_NO_PROPERTIES
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        * Api/qwebpage.cpp:
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+
 2010-06-02  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

@@ -94 +94 @@
     // around and don't remove it.
     // https://bugs.webkit.org/show_bug.cgi?id=35340
-    QUrl inspectorUrl = inspector->property("_q_inspectorUrl").toUrl();
+    QUrl inspectorUrl;
+#ifndef QT_NO_PROPERTIES
+    inspectorUrl = inspector->property("_q_inspectorUrl").toUrl();
+#endif
     if (!inspectorUrl.isValid())
         inspectorUrl = QUrl("qrc:/webkit/inspector/inspector.html");

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        [Qt] Fix compilation with QT_NO_PROPERTIES
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        * QtTestBrowser/main.cpp:
+        (LauncherWindow::init):
+
 2010-06-02  Diego Gonzalez  <diegohcg@webkit.org>
 

trunk/WebKitTools/QtTestBrowser/main.cpp

@@ -239 +239 @@
 
     m_inspector = new WebInspector(splitter);
+#ifndef QT_NO_PROPERTIES
     if (!gInspectorUrl.isEmpty())
         m_inspector->setProperty("_q_inspectorUrl", gInspectorUrl);
+#endif
     m_inspector->setPage(page());
     m_inspector->hide();