[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
eric at webkit.org
eric at webkit.org
Wed Mar 17 18:35:37 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 53e4f5543d771c9b4d27d1329e0adcb79e661971
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 12 07:24:11 2010 +0000
2010-03-11 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Laszlo Gombos.
[Qt] Enable network state notifier when compiling against Qt 4.7
https://bugs.webkit.org/show_bug.cgi?id=35983
* WebCore.pri:
* platform/network/qt/NetworkStateNotifierPrivate.h:
* platform/network/qt/NetworkStateNotifierQt.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55891 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe1bbe3..fb1e787 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-11 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] Enable network state notifier when compiling against Qt 4.7
+ https://bugs.webkit.org/show_bug.cgi?id=35983
+
+ * WebCore.pri:
+ * platform/network/qt/NetworkStateNotifierPrivate.h:
+ * platform/network/qt/NetworkStateNotifierQt.cpp:
+
2010-03-11 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Adam Treat.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 88fef5e..d738e3c 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -105,6 +105,9 @@ greaterThan(QT_MINOR_VERSION, 5) {
}
}
+# Bearer management is part of Qt 4.7
+!lessThan(QT_MINOR_VERSION, 7):!contains(DEFINES, ENABLE_QT_BEARER=.):DEFINES += ENABLE_QT_BEARER=1
+
DEFINES += WTF_CHANGES=1
# Enable touch event support with Qt 4.6
diff --git a/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h b/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h
index 536b06a..86b367b 100644
--- a/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h
+++ b/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h
@@ -22,9 +22,13 @@
#include <QObject>
+#if QT_VERSION < 0x040700
namespace QtMobility {
class QNetworkConfigurationManager;
}
+#else
+class QNetworkConfigurationManager;
+#endif
namespace WebCore {
@@ -40,7 +44,11 @@ public slots:
void networkAccessPermissionChanged(bool);
public:
+#if QT_VERSION < 0x040700
QtMobility::QNetworkConfigurationManager* m_configurationManager;
+#else
+ QNetworkConfigurationManager* m_configurationManager;
+#endif
bool m_online;
bool m_networkAccessAllowed;
NetworkStateNotifier* m_notifier;
diff --git a/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp b/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp
index e694264..52512aa 100644
--- a/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp
+++ b/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp
@@ -23,7 +23,9 @@
#include "NetworkStateNotifierPrivate.h"
#include "qnetworkconfigmanager.h"
+#if QT_VERSION < 0x040700
using namespace QtMobility;
+#endif
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list