Changeset 865 for trunk/src/network/bearer
- Timestamp:
- May 16, 2011, 4:09:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/network/bearer/qnetworksession.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.3 (added) merged: 864 /branches/vendor/nokia/qt/current merged: 863 /branches/vendor/nokia/qt/4.7.2 removed
- Property svn:mergeinfo changed
-
trunk/src/network/bearer/qnetworksession.h
r846 r865 142 142 #ifndef QT_MOBILITY_BEARER 143 143 QT_END_NAMESPACE 144 Q_DECLARE_METATYPE(QNetworkSession::State) 145 Q_DECLARE_METATYPE(QNetworkSession::SessionError) 144 146 #else 145 147 QTM_END_NAMESPACE 146 148 #endif 147 148 Q_DECLARE_METATYPE(QNetworkSession::State)149 Q_DECLARE_METATYPE(QNetworkSession::SessionError)150 149 151 150 QT_END_HEADER
Note:
See TracChangeset
for help on using the changeset viewer.
