diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 16:05:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 16:05:32 (GMT) |
| commit | 184398f4ada4b34fc9834c2341597a3b8c18e842 (patch) | |
| tree | 476b9b43b9cb12b0817d940c224dbb06a3c849f1 /src/network/bearer | |
| parent | 373d8a06c21fb3d237d1f2c7be604e1bcf7e42fa (diff) | |
| parent | d7cf3e40e491a92212ee57b88541d14bd79c4f4f (diff) | |
| download | Qt-184398f4ada4b34fc9834c2341597a3b8c18e842.zip Qt-184398f4ada4b34fc9834c2341597a3b8c18e842.tar.gz Qt-184398f4ada4b34fc9834c2341597a3b8c18e842.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/network/bearer')
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 59d048a..688f37e 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -142,13 +142,12 @@ private: #ifndef QT_MOBILITY_BEARER QT_END_NAMESPACE +Q_DECLARE_METATYPE(QNetworkSession::State) +Q_DECLARE_METATYPE(QNetworkSession::SessionError) #else QTM_END_NAMESPACE #endif -Q_DECLARE_METATYPE(QNetworkSession::State) -Q_DECLARE_METATYPE(QNetworkSession::SessionError) - QT_END_HEADER #endif // QT_NO_BEARERMANAGEMENT |