summaryrefslogtreecommitdiffstats
path: root/src/tools/qdbuscpp2xml
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-11 16:55:55 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-14 19:01:19 +0000
commit190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch)
tree3feb15de63b05cda8339d784c46f929ad4000357 /src/tools/qdbuscpp2xml
parent440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff)
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done: Handle GSS library / feature with a new custom find module. Implement rudimentary support for relocatability (does not currently handle extprefix). Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/tools/qdbuscpp2xml')
-rw-r--r--src/tools/qdbuscpp2xml/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qdbuscpp2xml/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index 5bcc873a43..ecb45e4416 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -7,6 +7,7 @@
add_qt_tool(qdbuscpp2xml
SOURCES
../moc/cbordevice.h
+ ../moc/collectjson.cpp ../moc/collectjson.h
../moc/generator.cpp ../moc/generator.h
../moc/moc.cpp ../moc/moc.h
../moc/outputrevision.h
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 30ba756f34..3bf127c0f1 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qt_tool(qdbuscpp2xml
TOOLS_TARGET DBus # special case
SOURCES
../moc/cbordevice.h
+ ../moc/collectjson.cpp ../moc/collectjson.h
../moc/generator.cpp ../moc/generator.h
../moc/moc.cpp ../moc/moc.h
../moc/outputrevision.h