Changeset 89454 in webkit

Timestamp:

Jun 22, 2011 11:57:04 AM (13 years ago)

Author:

Ademar Reis

Message:

2011-06-22 Ademar de Souza Reis Jr. <Ademar Reis>

Reviewed by Holger Freyther.

[Qt] Fix Qt namespace on QDeclarativeWebView autotest
​https://bugs.webkit.org/show_bug.cgi?id=63147

Applications (such as the test runner) are not supposed to be wrapped
by {QT_BEGIN,QT_END}_NAMESPACE macros, otherwise building Qt (or
QtWebKit) with a specific namespace won't work (will result in main
being undefined).

This was the only test wrapped by these macros, all others are fine.

• tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: remove namespace macros.

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (modified) (2 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-06-22  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Fix Qt namespace on QDeclarativeWebView autotest
+        https://bugs.webkit.org/show_bug.cgi?id=63147
+
+        Applications (such as the test runner) are not supposed to be wrapped
+        by {QT_BEGIN,QT_END}_NAMESPACE macros, otherwise building Qt (or
+        QtWebKit) with a specific namespace won't work (will result in main
+        being undefined).
+
+        This was the only test wrapped by these macros, all others are fine.
+
+        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: remove
+        namespace macros.
+
 2011-06-20  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp

@@ -14 +14 @@
 #include <QWebFrame>
 #include "qdeclarativewebview_p.h"
-
-QT_BEGIN_NAMESPACE
 
 class tst_QDeclarativeWebView : public QObject {
@@ -549 +547 @@
 QTEST_MAIN(tst_QDeclarativeWebView)
 #include "tst_qdeclarativewebview.moc"
-
-QT_END_NAMESPACE