diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-19 04:47:55 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-19 04:47:55 (GMT) |
| commit | 2b386e05e495df97fffcdfb58096756ba6f394cd (patch) | |
| tree | 1d77e4bb4ffe2eaa6c2252931151e544a69a7c2d /util/qlalr/main.cpp | |
| parent | 99021e6e9e549701911d1bb585bc925357d29f77 (diff) | |
| parent | adb1994279333ff7356790649548d62f623739ac (diff) | |
| download | Qt-2b386e05e495df97fffcdfb58096756ba6f394cd.zip Qt-2b386e05e495df97fffcdfb58096756ba6f394cd.tar.gz Qt-2b386e05e495df97fffcdfb58096756ba6f394cd.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 ()) |