Title: [89454] trunk/Source/WebKit/qt
- Revision
- 89454
- Author
- [email protected]
- Date
- 2011-06-22 11:57:04 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Ademar de Souza Reis Jr. <[email protected]>
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (89453 => 89454)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-22 18:26:03 UTC (rev 89453)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-22 18:57:04 UTC (rev 89454)
@@ -1,3 +1,20 @@
+2011-06-22 Ademar de Souza Reis Jr. <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (89453 => 89454)
--- trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2011-06-22 18:26:03 UTC (rev 89453)
+++ trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2011-06-22 18:57:04 UTC (rev 89454)
@@ -14,8 +14,6 @@
#include <QWebFrame>
#include "qdeclarativewebview_p.h"
-QT_BEGIN_NAMESPACE
-
class tst_QDeclarativeWebView : public QObject {
Q_OBJECT
@@ -548,5 +546,3 @@
QTEST_MAIN(tst_QDeclarativeWebView)
#include "tst_qdeclarativewebview.moc"
-
-QT_END_NAMESPACE
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
