diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-28 10:44:29 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-28 02:35:26 +0100 |
| commit | 74f243cec64a4ea0720bcc6e44d9c1757790cae4 (patch) | |
| tree | 5b85964f7722d3869645954a9eab916de72a227f /tests/auto/qnmeapositioninfosource | |
| parent | 25bcf5c5c7bb2dc7b1d768ada9eecf9a5dd88109 (diff) | |
| download | qtlocation-74f243cec64a4ea0720bcc6e44d9c1757790cae4.tar.gz | |
Fixed QtLocation namespace compilation.
Change-Id: Ia74ad72b1ab035f173e61d66397577c9bcae7e67
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests/auto/qnmeapositioninfosource')
| -rw-r--r-- | tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp index 8bcd9eb8..f9c53a34 100644 --- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp @@ -49,7 +49,6 @@ #include <QSignalSpy> #include <QTest> -QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode) Q_DECLARE_METATYPE(QGeoPositionInfo) diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h index 2105f35c..056e5023 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h @@ -46,11 +46,11 @@ #include <qnmeapositioninfosource.h> -QT_USE_NAMESPACE - +QT_BEGIN_NAMESPACE class QTcpServer; class QIODevice; class QNmeaPositionInfoSource; +QT_END_NAMESPACE class QNmeaPositionInfoSourceProxy : public QObject { |