summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-27 02:13:55 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-27 02:13:55 +1000
commit41de32155e0a862ec7f6aacbcf985f06950bfda9 (patch)
tree9fe6b20d6e0b12fb53a0398f67f0a2702a9ad750 /util
parentb885787eee96f444e73c7a9d6f6b63f65ef2c172 (diff)
parent5498dcd7b10e147734a3414cab824b8b435aa3d9 (diff)
downloadqt4-tools-41de32155e0a862ec7f6aacbcf985f06950bfda9.tar.gz
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'util')
-rw-r--r--util/xkbdatagen/README1
-rw-r--r--util/xkbdatagen/main.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/util/xkbdatagen/README b/util/xkbdatagen/README
new file mode 100644
index 0000000000..bae68b8765
--- /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 3ec2f575c3..b8ececcd14 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