diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-18 06:26:06 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-18 06:26:06 (GMT) |
commit | 06ef461b5374c42370fc350f53dba76a5d4c62f4 (patch) | |
tree | eb33081ef8f5f3a81c3f2ce14a73090fd610ab91 /tools/qtconcurrent/codegenerator/src/codegenerator.cpp | |
parent | 5e435bfcad5a05c775c9d45edbd2659c87416754 (diff) | |
parent | 4b90559d0a8b693241dd79682d0d31362497468b (diff) | |
download | Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.zip Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.tar.gz Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.tar.bz2 |
Merge remote-tracking branch 'review/master'
Diffstat (limited to 'tools/qtconcurrent/codegenerator/src/codegenerator.cpp')
-rw-r--r-- | tools/qtconcurrent/codegenerator/src/codegenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp index b8436b9..c81fe97 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp @@ -134,7 +134,7 @@ const Compound operator+(const Item &a, const char * const text) const Compound operator+(const char * const text, const Item &b) { - return Compound(Text(text), b); + return Compound(Text(text), b); } -}
\ No newline at end of file +} |