Changeset 58662 in webkit


Ignore:
Timestamp:
May 2, 2010 3:18:56 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-05-02 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix compilation with QT_NO_BEARERMANAGEMENT
​https://bugs.webkit.org/show_bug.cgi?id=38324

  • platform/network/NetworkStateNotifier.h:
  • platform/network/qt/NetworkStateNotifierQt.cpp:

2010-05-02 Tasuku Suzuki <​tasuku.suzuki@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix compilation with QT_NO_BEARERMANAGEMENT
​https://bugs.webkit.org/show_bug.cgi?id=38324

  • Api/qwebsettings.cpp:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r58661 r58662  
     12010-05-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] Fix compilation with QT_NO_BEARERMANAGEMENT
     6        https://bugs.webkit.org/show_bug.cgi?id=38324
     7
     8        * platform/network/NetworkStateNotifier.h:
     9        * platform/network/qt/NetworkStateNotifierQt.cpp:
     10
    1112010-04-29  Janne Koskinen  <janne.p.koskinen@digia.com>
    212

  • trunk/WebCore/platform/network/NetworkStateNotifier.h

    r52928 r58662  
    4444
    4545#include <windows.h>
     46
     47#elif PLATFORM(QT)
     48
     49#include <QtCore/qglobal.h>
     50
     51#ifdef QT_NO_BEARERMANAGEMENT
     52#undef ENABLE_QT_BEARER
     53#define ENABLE_QT_BEARER 0
     54#endif
    4655
    4756#endif

  • trunk/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp

    r55891 r58662  
    2020#include "config.h"
    2121#include "NetworkStateNotifier.h"
     22
     23#if PLATFORM(QT) && ENABLE(QT_BEARER)
    2224
    2325#include "NetworkStateNotifierPrivate.h"
    … …  
    9092} // namespace WebCore
    9193
     94#endif
     95
    9296#include "moc_NetworkStateNotifierPrivate.cpp"

  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r58112 r58662  
    4949#include <QFileInfo>
    5050
    51 #if ENABLE(QT_BEARER)
    5251#include "NetworkStateNotifier.h"
    53 #endif
    5452
    5553void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed)

  • trunk/WebKit/qt/ChangeLog

    r58661 r58662  
     12010-05-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] Fix compilation with QT_NO_BEARERMANAGEMENT
     6        https://bugs.webkit.org/show_bug.cgi?id=38324
     7
     8        * Api/qwebsettings.cpp:
     9
    1102010-04-29  Janne Koskinen  <janne.p.koskinen@digia.com>
    211
Note: See TracChangeset for help on using the changeset viewer.