diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 08:18:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 08:18:53 (GMT) |
| commit | d7cf3e40e491a92212ee57b88541d14bd79c4f4f (patch) | |
| tree | c74721dede95f6b5c51a321de18c18fcc3b1fef6 /src/network | |
| parent | c8cd1711c2e4c3a9f4b0240e46ab799247204ce0 (diff) | |
| parent | f86e014bb6f2754bfed33106021a809ca8c2ce73 (diff) | |
| download | Qt-d7cf3e40e491a92212ee57b88541d14bd79c4f4f.zip Qt-d7cf3e40e491a92212ee57b88541d14bd79c4f4f.tar.gz Qt-d7cf3e40e491a92212ee57b88541d14bd79c4f4f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QTBUG-17627: build break in mobility bearer applications
Diffstat (limited to 'src/network')
| -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 e107c62..ee28e64 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -141,13 +141,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 |