diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h')
| -rw-r--r-- | Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h b/Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h index 766dc90..4b8252c 100644 --- a/Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h +++ b/Source/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h @@ -22,15 +22,9 @@ #include <QObject> -#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0) -namespace QtMobility { -class QNetworkConfigurationManager; -} -#else QT_BEGIN_NAMESPACE class QNetworkConfigurationManager; QT_END_NAMESPACE -#endif namespace WebCore { @@ -46,11 +40,7 @@ public slots: void networkAccessPermissionChanged(bool); public: -#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0) - QtMobility::QNetworkConfigurationManager* m_configurationManager; -#else QNetworkConfigurationManager* m_configurationManager; -#endif bool m_online; bool m_networkAccessAllowed; NetworkStateNotifier* m_notifier; |