diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
| commit | 7f27ebb0383414f15f391151655e5b09952f8ccd (patch) | |
| tree | 8af7b866af6115924a13896013f5b6f5da686de6 /tools/qtconcurrent | |
| parent | 3dccb66b3b81627fb70c7eeccdf32b96d8add8b7 (diff) | |
| parent | 78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff) | |
| download | Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.zip Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.gz Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Diffstat (limited to 'tools/qtconcurrent')
| -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 +} |