diff options
| author | Liang Qi <[email protected]> | 2016-02-02 15:57:44 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-02-02 15:57:44 +0100 |
| commit | d3e6e732c70ebc2340d6376d727b3c623be23810 (patch) | |
| tree | 18d469f02ac36edd04b87a9bfa4886ceef0490f0 /src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | |
| parent | fdfd63053ae6b10af06553be3c1b15de274bebf7 (diff) | |
| parent | ba8d3430029d8c4342e9a47c110ee8c9879818f4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
config.tests/unix/compile.test
src/plugins/platforms/cocoa/qcocoahelpers.mm
src/tools/qlalr/cppgenerator.cpp
Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
Diffstat (limited to 'src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp')
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 2aa8efe7b4c..1b06845c469 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -62,7 +62,7 @@ static const char docTypeHeader[] = #define PROGRAMNAME "qdbuscpp2xml" #define PROGRAMVERSION "0.2" -#define PROGRAMCOPYRIGHT "Copyright (C) 2015 The Qt Company Ltd." +#define PROGRAMCOPYRIGHT "Copyright (C) 2016 The Qt Company Ltd." static QString outputFile; static int flags; |