diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
| commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
| tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /util | |
| parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
| parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'util')
| -rw-r--r-- | util/lexgen/README | 2 | ||||
| -rw-r--r-- | util/local_database/xpathlite.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/lexgen/README b/util/lexgen/README index 9feb18d1e3..435c7f31ee 100644 --- a/util/lexgen/README +++ b/util/lexgen/README @@ -13,4 +13,4 @@ Use at your own risk ;-) -- -Simon Hausmann <simon.hausmann@nokia.com> +Simon Hausmann <simon.hausmann@digia.com> diff --git a/util/local_database/xpathlite.py b/util/local_database/xpathlite.py index 3b26c16a81..b8205b453e 100644 --- a/util/local_database/xpathlite.py +++ b/util/local_database/xpathlite.py @@ -248,7 +248,7 @@ def _findEntry(base, path, draft=None, attribute=None): # see http://www.unicode.org/reports/tr35/#Common_Elements aliasfile = os.path.dirname(file) + "/" + alias + ".xml" if not os.path.isfile(aliasfile): - raise Error("findEntry: fatal error: found an alias '%s' to '%s', but the alias file couldnt be found" % (filename, alias)) + raise Error("findEntry: fatal error: found an alias '%s' to '%s', but the alias file couldn't be found" % (filename, alias)) # found an alias, recurse into parsing it result = _findEntry(aliasfile, path, draft, attribute) return result |