diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 16:52:00 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 16:52:00 +1000 |
| commit | 61d63f73443e82176f3ee98984cfa3132a3b416e (patch) | |
| tree | 14c831c86f3011d3da5a659c01c7c0c2620cf03d | |
| parent | 65eeff39f1ded93ff48dbbd7058a6987f6642936 (diff) | |
| parent | f8b7ee7b2e20537aaf639e5b2847d67e1c24d87a (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging:
make compile while Qt is compiled with namespace
| -rw-r--r-- | src/sensors/qsensor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index 59ef1593..f4d1a773 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -241,11 +241,12 @@ private: } +QT_END_NAMESPACE + Q_DECLARE_METATYPE(qtimestamp) Q_DECLARE_METATYPE(qrange) Q_DECLARE_METATYPE(qrangelist) Q_DECLARE_METATYPE(qoutputrangelist) -QT_END_NAMESPACE #endif |