diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-07-06 09:51:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-06 17:31:15 +0200 |
| commit | 91d22556d7184be9cb93101604ef63c821329949 (patch) | |
| tree | a2455dce01d1a8e631539df144fc0f94dbeeebd2 | |
| parent | b206feabe78994cfc501dd7dcc9d763d615289d1 (diff) | |
| download | qt-creator-91d22556d7184be9cb93101604ef63c821329949.tar.gz | |
Fix compilation with namespaced Qt.
Change-Id: I0407a74e33680ed7bb61298dc1bab3da62c3f938
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/shared/proparser/ioutils.cpp | 4 | ||||
| -rw-r--r-- | src/shared/proparser/ioutils.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index eaaf18e698..a79e0ba20f 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -43,6 +43,8 @@ # include <unistd.h> #endif +QT_BEGIN_NAMESPACE + using namespace ProFileEvaluatorInternal; IoUtils::FileType IoUtils::fileType(const QString &fileName) @@ -150,3 +152,5 @@ QString IoUtils::shellQuote(const QString &arg) return ret; } #endif + +QT_END_NAMESPACE diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index b3f98ba53b..d001771006 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -35,7 +35,7 @@ #include <QString> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE namespace ProFileEvaluatorInternal { @@ -62,6 +62,8 @@ public: #endif }; -} +} // namespace ProFileEvaluatorInternal + +QT_END_NAMESPACE #endif // IOUTILS_H |