diff options
| author | David Faure <faure@kde.org> | 2009-06-04 23:55:22 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-04 23:55:22 (GMT) |
| commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
| tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/network | |
| parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
| download | Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2 | |
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index fd3a85a..a5fd60e 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -324,7 +324,7 @@ QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery return result; } -Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy); +Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy) namespace { template<bool> struct StaticAssertTest; |