diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 16:38:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:11:58 +0100 |
| commit | c1c4a874e31ba108a3600fbbb0aee7fc0bf34601 (patch) | |
| tree | 1d052689b20b41b80651d4314d55f7dde9462038 /src/qmldom | |
| parent | b6a164891537d6d3a515d78a44b0de6595a170c2 (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some incorrect qmake project files
Pick-to: 6.0
Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qmldom')
| -rw-r--r-- | src/qmldom/.prev_CMakeLists.txt | 29 | ||||
| -rw-r--r-- | src/qmldom/CMakeLists.txt | 25 |
2 files changed, 42 insertions, 12 deletions
diff --git a/src/qmldom/.prev_CMakeLists.txt b/src/qmldom/.prev_CMakeLists.txt new file mode 100644 index 0000000000..39a82e3ec0 --- /dev/null +++ b/src/qmldom/.prev_CMakeLists.txt @@ -0,0 +1,29 @@ +# Generated from qmldom.pro. + +##################################################################### +## QmlDom Module: +##################################################################### + +qt_internal_add_module(QmlDom + STATIC + INTERNAL_MODULE + NO_SYNC_QT + SOURCES + qqmldom_fwd_p.h + qqmldom_global.h + qqmldomconstants_p.h + qqmldomerrormessage.cpp qqmldomerrormessage_p.h + qqmldomexternalitems.cpp qqmldomexternalitems_p.h + qqmldomitem.cpp qqmldomitem_p.h + qqmldompath.cpp qqmldompath_p.h + qqmldomstringdumper.cpp qqmldomstringdumper_p.h + qqmldomtop.cpp qqmldomtop_p.h + DEFINES + QMLDOM_LIBRARY + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::QmlDevToolsPrivate +) + +#### Keys ignored in scope 1:.:.:qmldom.pro:<TRUE>: +# _OPTION = "host_build" diff --git a/src/qmldom/CMakeLists.txt b/src/qmldom/CMakeLists.txt index df3da266f8..491df40ef5 100644 --- a/src/qmldom/CMakeLists.txt +++ b/src/qmldom/CMakeLists.txt @@ -1,28 +1,29 @@ # Generated from qmldom.pro. ##################################################################### -## QmlCompiler Module: +## QmlDom Module: ##################################################################### qt_internal_add_module(QmlDom STATIC INTERNAL_MODULE + # NO_SYNC_QT # special case remove, it's actually needed for tests SOURCES - qqmldom_global.h - qqmldom_fwd_p.h - qqmldomconstants_p.h - qqmldomerrormessage.cpp qqmldomerrormessage_p.h - qqmldomexternalitems.cpp qqmldomexternalitems_p.h - qqmldomitem.cpp qqmldomitem_p.h - qqmldompath.cpp qqmldompath_p.h - qqmldomstringdumper.cpp qqmldomstringdumper_p.h - qqmldomtop.cpp qqmldomtop_p.h + qqmldom_fwd_p.h + qqmldom_global.h + qqmldomconstants_p.h + qqmldomerrormessage.cpp qqmldomerrormessage_p.h + qqmldomexternalitems.cpp qqmldomexternalitems_p.h + qqmldomitem.cpp qqmldomitem_p.h + qqmldompath.cpp qqmldompath_p.h + qqmldomstringdumper.cpp qqmldomstringdumper_p.h + qqmldomtop.cpp qqmldomtop_p.h DEFINES - QMLDOM_LIBRARY + QMLDOM_LIBRARY PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlDevToolsPrivate ) -#### Keys ignored in scope 1:.:.:qmlcompiler.pro:<TRUE>: +#### Keys ignored in scope 1:.:.:qmldom.pro:<TRUE>: # _OPTION = "host_build" |