diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-29 13:15:59 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-11 10:12:12 (GMT) |
| commit | 1502df3ddedc5a4365e12bce570d946744259785 (patch) | |
| tree | 977757c93743bce8df23a180e64a08f749935ba7 /util/qlalr/main.cpp | |
| parent | c412b5f144ea99ea70f4df291678631e13900962 (diff) | |
| download | Qt-1502df3ddedc5a4365e12bce570d946744259785.zip Qt-1502df3ddedc5a4365e12bce570d946744259785.tar.gz Qt-1502df3ddedc5a4365e12bce570d946744259785.tar.bz2 | |
utils/qlalr generator: adapt changes to xmlstream and script files
some changes were made to qxmlstream_p.h and script files directly;
however, those files are generated automatically by
src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh,
respectively, so the generator would overwrite the manual changes to the
files the next time it is run. This patch integrates those changes into
the generator rather than into the files directly.
Reviewed-by: Roberto Raggi
Reviewed-by: Olivier Goffart
Diffstat (limited to 'util/qlalr/main.cpp')
| -rw-r--r-- | util/qlalr/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp index 7041e4a..d864796 100644 --- a/util/qlalr/main.cpp +++ b/util/qlalr/main.cpp @@ -64,7 +64,7 @@ static void help_me () << " --no-debug\t\tno debug information" << endl << " --no-lines\t\tno #line directives" << endl << " --dot\t\t\tgenerate a graph" << endl - << " --troll\t\tadd the Trolltech copyright header" << endl + << " --qt\t\tadd the Qt copyright header and Qt-specific types and macros" << endl << endl; exit (0); } @@ -100,7 +100,7 @@ int main (int argc, char *argv[]) else if (arg == QLatin1String ("--no-debug")) debug_info = false; - else if (arg == QLatin1String ("--troll")) + else if (arg == QLatin1String ("--qt")) troll_copyright = true; else if (file_name.isEmpty ()) |