summaryrefslogtreecommitdiffstats
path: root/src/network/bearer
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-03-08 18:46:00 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-03-08 18:48:34 (GMT)
commit849ad907d49e6f6866dc81c0e3a94514bdc69b40 (patch)
treeb965335d1c8f0f5894718d3e5fc931fa98068e3b /src/network/bearer
parent1500707a35ec95571d3dc1573e54d44420ee9098 (diff)
downloadQt-849ad907d49e6f6866dc81c0e3a94514bdc69b40.zip
Qt-849ad907d49e6f6866dc81c0e3a94514bdc69b40.tar.gz
Qt-849ad907d49e6f6866dc81c0e3a94514bdc69b40.tar.bz2
Fix compile error introduced by merge
Basically the same as f86e014bb6f2754bfed33106021a809ca8c2ce73. The declarations were appearing twice in the header file after merging Reviewed-by: Trust Me
Diffstat (limited to 'src/network/bearer')
-rw-r--r--src/network/bearer/qnetworksession.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index c08a9bf..688f37e 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -140,9 +140,6 @@ private:
QNetworkSessionPrivate *d;
};
-Q_DECLARE_METATYPE(QNetworkSession::State);
-Q_DECLARE_METATYPE(QNetworkSession::SessionError);
-
#ifndef QT_MOBILITY_BEARER
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QNetworkSession::State)