Title: [114110] trunk/Source/WebKit/qt
- Revision
- 114110
- Author
- [email protected]
- Date
- 2012-04-13 04:16:34 -0700 (Fri, 13 Apr 2012)
Log Message
[Qt] Build fix with QT_NO_BEARERMANAGEMENT
Reviewed by Jocelyn Turcotte.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (114109 => 114110)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-13 11:16:34 UTC (rev 114110)
@@ -1,5 +1,18 @@
2012-04-13 Tor Arne Vestbø <[email protected]>
+ [Qt] Build fix with QT_NO_BEARERMANAGEMENT
+
+ Reviewed by Jocelyn Turcotte.
+
+ * tests/benchmarks/loading/tst_loading.cpp:
+ (tst_Loading):
+ (tst_Loading::load):
+ * tests/benchmarks/painting/tst_painting.cpp:
+ (tst_Painting):
+ (tst_Painting::paint):
+
+2012-04-13 Tor Arne Vestbø <[email protected]>
+
[Qt] Fix build on OS X
We were manually including the directories needed from WTF, instead of
Modified: trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp (114109 => 114110)
--- trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp 2012-04-13 11:16:34 UTC (rev 114110)
@@ -17,7 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef QT_NO_BEARERMANAGEMENT
#include <QNetworkConfigurationManager>
+#endif
#include <QtTest/QtTest>
@@ -42,7 +44,9 @@
void load();
private:
+#ifndef QT_NO_BEARERMANAGEMENT
QNetworkConfigurationManager m_manager;
+#endif
QWebView* m_view;
QWebPage* m_page;
};
@@ -74,8 +78,10 @@
{
QFETCH(QUrl, url);
+#ifndef QT_NO_BEARERMANAGEMENT
if (!m_manager.isOnline())
W_QSKIP("This test requires an active network connection", SkipSingle);
+#endif
QBENCHMARK {
m_view->load(url);
Modified: trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp (114109 => 114110)
--- trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp 2012-04-13 11:11:59 UTC (rev 114109)
+++ trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp 2012-04-13 11:16:34 UTC (rev 114110)
@@ -17,7 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef QT_NO_BEARERMANAGEMENT
#include <QNetworkConfigurationManager>
+#endif
#include <QtTest/QtTest>
@@ -44,7 +46,9 @@
void textAreas();
private:
+#ifndef QT_NO_BEARERMANAGEMENT
QNetworkConfigurationManager m_manager;
+#endif
QWebView* m_view;
QWebPage* m_page;
};
@@ -74,8 +78,10 @@
{
QFETCH(QUrl, url);
+#ifndef QT_NO_BEARERMANAGEMENT
if (!m_manager.isOnline())
W_QSKIP("This test requires an active network connection", SkipSingle);
+#endif
m_view->load(url);
::waitForSignal(m_view, SIGNAL(loadFinished(bool)), 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
