summaryrefslogtreecommitdiffstats
path: root/tools/porting/src
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-05-31 09:33:05 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-26 12:22:17 (GMT)
commit58f2b5af3caf6b9cc0a45856ee3be412c22dbb69 (patch)
tree001ec9faeb39acb69adb4c3d9292557a8aa241eb /tools/porting/src
parent39b7982de7bb8f80dd915591b8a391e18476e456 (diff)
downloadQt-58f2b5af3caf6b9cc0a45856ee3be412c22dbb69.zip
Qt-58f2b5af3caf6b9cc0a45856ee3be412c22dbb69.tar.gz
Qt-58f2b5af3caf6b9cc0a45856ee3be412c22dbb69.tar.bz2
Do not use global static const references to objects
They don't compile with clang
Diffstat (limited to 'tools/porting/src')
-rw-r--r--tools/porting/src/errors.cpp6
-rw-r--r--tools/porting/src/errors.h6
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