diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 11:07:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 11:07:58 (GMT) |
| commit | 5498dcd7b10e147734a3414cab824b8b435aa3d9 (patch) | |
| tree | 18e17a2fe09f8c618af467528e11ffbd3b27d01f | |
| parent | 1d2d61f6b1cc2472f3cb28e4158fe12a675517ea (diff) | |
| parent | 977ed996677e6156df1a89011d2aefb1c475af4c (diff) | |
| download | Qt-5498dcd7b10e147734a3414cab824b8b435aa3d9.zip Qt-5498dcd7b10e147734a3414cab824b8b435aa3d9.tar.gz Qt-5498dcd7b10e147734a3414cab824b8b435aa3d9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add util/xkbdatagen/README
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11_p.cpp | 1 | ||||
| -rw-r--r-- | util/xkbdatagen/README | 1 | ||||
| -rw-r--r-- | util/xkbdatagen/main.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qkeymapper_x11_p.cpp b/src/gui/kernel/qkeymapper_x11_p.cpp index 1fad4b0..2dbe1e7 100644 --- a/src/gui/kernel/qkeymapper_x11_p.cpp +++ b/src/gui/kernel/qkeymapper_x11_p.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ // This file is auto-generated, do not edit! +// (Generated using util/xkbdatagen) static struct { const char *layout; diff --git a/util/xkbdatagen/README b/util/xkbdatagen/README new file mode 100644 index 0000000..bae68b8 --- /dev/null +++ b/util/xkbdatagen/README @@ -0,0 +1 @@ +program used to generate qkeymapper_x11_p.cpp diff --git a/util/xkbdatagen/main.cpp b/util/xkbdatagen/main.cpp index 3ec2f57..b8ececc 100644 --- a/util/xkbdatagen/main.cpp +++ b/util/xkbdatagen/main.cpp @@ -456,6 +456,7 @@ int main(int argc, char **argv) "****************************************************************************/\n" "\n" "// This file is auto-generated, do not edit!\n" + "// (Generated using util/xkbdatagen)\n" "\n"); // data structure |