diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-05 09:58:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-05 09:58:55 (GMT) |
| commit | 2144aece152bc34faff5b25632e808e96d523f48 (patch) | |
| tree | 7a3762788646792cd131f13ce4115111d16790fe /examples/declarative/cppextensions/referenceexamples/adding/main.cpp | |
| parent | babf1ff43584b454ac24728fbf93bf291b9f36d1 (diff) | |
| parent | 1be2e830da7aa09f92d8cdca906f8a588cd10381 (diff) | |
| download | Qt-2144aece152bc34faff5b25632e808e96d523f48.zip Qt-2144aece152bc34faff5b25632e808e96d523f48.tar.gz Qt-2144aece152bc34faff5b25632e808e96d523f48.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'examples/declarative/cppextensions/referenceexamples/adding/main.cpp')
| -rw-r--r-- | examples/declarative/cppextensions/referenceexamples/adding/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp index f429b6e..391113c 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char ** argv) qWarning() << "The person's name is" << person->name(); qWarning() << "They wear a" << person->shoeSize() << "sized shoe"; } else { - qWarning() << "An error occured"; + qWarning() << "An error occurred"; } return 0; |