[Qt] Build fix with QT_NO_BEARERMANAGEMENT

Reviewed by Jocelyn Turcotte.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 9ea03dc..c014474 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
 2012-04-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
+        [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ø  <tor.arne.vestbo@nokia.com>
+
         [Qt] Fix build on OS X
 
         We were manually including the directories needed from WTF, instead of

diff --git a/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp b/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp
index 1c3985b..2ebf377 100644 (file)
--- a/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp
+++ b/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp
@@ -17,7 +17,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef QT_NO_BEARERMANAGEMENT
 #include <QNetworkConfigurationManager>
+#endif
 
 #include <QtTest/QtTest>
 
@@ -42,7 +44,9 @@ private Q_SLOTS:
     void load();
 
 private:
+#ifndef QT_NO_BEARERMANAGEMENT
     QNetworkConfigurationManager m_manager;
+#endif
     QWebView* m_view;
     QWebPage* m_page;
 };
@@ -74,8 +78,10 @@ void tst_Loading::load()
 {
     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);

diff --git a/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp b/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp
index 3f97b5a..8abba4b 100644 (file)
--- a/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp
+++ b/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp
@@ -17,7 +17,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef QT_NO_BEARERMANAGEMENT
 #include <QNetworkConfigurationManager>
+#endif
 
 #include <QtTest/QtTest>
 
@@ -44,7 +46,9 @@ private Q_SLOTS:
     void textAreas();
 
 private:
+#ifndef QT_NO_BEARERMANAGEMENT
     QNetworkConfigurationManager m_manager;
+#endif
     QWebView* m_view;
     QWebPage* m_page;
 };
@@ -74,8 +78,10 @@ void tst_Painting::paint()
 {
     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);