diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
| commit | d3b898e973662707f9644b4fe5f8d18849929723 (patch) | |
| tree | cf7644a23cc1787c1b710c7c1ebd0b6e028d3ca7 /tools/porting | |
| parent | a8030e0c543e538652605557843b845f89b11589 (diff) | |
| parent | 40b6c1dd9199ac5e0d6a1921b05c11e647d09dca (diff) | |
| download | Qt-d3b898e973662707f9644b4fe5f8d18849929723.zip Qt-d3b898e973662707f9644b4fe5f8d18849929723.tar.gz Qt-d3b898e973662707f9644b4fe5f8d18849929723.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/porting')
| -rw-r--r-- | tools/porting/src/errors.cpp | 6 | ||||
| -rw-r--r-- | tools/porting/src/errors.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp index 580efb5..9081dba 100644 --- a/tools/porting/src/errors.cpp +++ b/tools/porting/src/errors.cpp @@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); +QT_STATIC_CONST_IMPL Error Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); QT_END_NAMESPACE diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h index f0ad691..dbac833 100644 --- a/tools/porting/src/errors.h +++ b/tools/porting/src/errors.h @@ -61,9 +61,9 @@ public: class Errors { public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + QT_STATIC_CONST Error InternalError; + QT_STATIC_CONST Error SyntaxError; + QT_STATIC_CONST Error ParseError; }; QT_END_NAMESPACE |