diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-09-01 15:39:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-09-01 15:39:29 (GMT) |
| commit | 586d73fd7d7503891193e84803d6fc55bda0baea (patch) | |
| tree | 7edf4924059da597d70c7178a367eecec9b8b0c2 /src/3rdparty/webkit | |
| parent | fe501b51b03c8c48c3efada83e8ae278c93ae5ab (diff) | |
| parent | 72db99402b10cb6225edd8fd30089cc4bf98e392 (diff) | |
| download | Qt-586d73fd7d7503891193e84803d6fc55bda0baea.zip Qt-586d73fd7d7503891193e84803d6fc55bda0baea.tar.gz Qt-586d73fd7d7503891193e84803d6fc55bda0baea.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/DerivedSources.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp index f698913..aaf8983 100644 --- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp +++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp @@ -334,5 +334,5 @@ // want StaticConstructors.h to "pollute" all the source files we #include here // accidentally, so we'll throw an error whenever any file includes it. #ifdef StaticConstructors_h -#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h +#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h #endif |