diff options
author | Shane Kearns <shane.kearns@sosco.com> | 2010-01-21 15:05:13 (GMT) |
---|---|---|
committer | Shane Kearns <shane.kearns@sosco.com> | 2010-01-21 15:05:13 (GMT) |
commit | 9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f (patch) | |
tree | 00156aa85d006a2eeae4772e8ccfe3572fb2db58 /tools/kmap2qmap | |
parent | d83e82e5c8a7fa0f6b1dcc4b1ab56f22afd942f6 (diff) | |
download | Qt-9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f.zip Qt-9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f.tar.gz Qt-9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f.tar.bz2 |
Merge from upstream
The patch accepted upstream changed a parameter from QString to
QStringList. So there is a corresponding change to main.cpp to use the
new API.
commit b1291ecfd0ab31c41783feb645c98ce42fa87aae
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 12:33:34 2010 +0100
trk: Add support for command line arguments in trk::Launcher.
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
Diffstat (limited to 'tools/kmap2qmap')
0 files changed, 0 insertions, 0 deletions