diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-12 11:29:28 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-12 13:21:09 +0100 |
| commit | da3a24c06541b63011a3af91fbae9f9d2ec28912 (patch) | |
| tree | 2a6c42c04e2a7187f3cf4180a3cfe5041694f4cb /src | |
| parent | b7834eefa615cf2ba2028ec7c7f525b74bdea969 (diff) | |
Re-generate the CMake project files
Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/activeqt/axbase/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/activeqt/container/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/activeqt/control/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/idc/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/tools/idc/CMakeLists.txt | 4 |
6 files changed, 25 insertions, 6 deletions
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt index 5034157..fc6b167 100644 --- a/src/activeqt/CMakeLists.txt +++ b/src/activeqt/CMakeLists.txt @@ -5,8 +5,8 @@ add_subdirectory(axbase) add_subdirectory(control) add_subdirectory(container) -qt_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt) -qt_add_docs(ActiveQt +qt_internal_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt) +qt_internal_add_docs(ActiveQt doc/activeqt.qdocconf ) # special case end diff --git a/src/activeqt/axbase/CMakeLists.txt b/src/activeqt/axbase/CMakeLists.txt index 787d240..65a71b3 100644 --- a/src/activeqt/axbase/CMakeLists.txt +++ b/src/activeqt/axbase/CMakeLists.txt @@ -4,7 +4,7 @@ ## AxBase Module: ##################################################################### -qt_add_module(AxBase +qt_internal_add_module(AxBase # special case STATIC INTERNAL_MODULE SOURCES diff --git a/src/activeqt/container/CMakeLists.txt b/src/activeqt/container/CMakeLists.txt index 0f2ac6d..da04320 100644 --- a/src/activeqt/container/CMakeLists.txt +++ b/src/activeqt/container/CMakeLists.txt @@ -4,7 +4,7 @@ ## AxContainer Module: ##################################################################### -qt_add_module(AxContainer +qt_internal_add_module(AxContainer # special case STATIC QMAKE_MODULE_CONFIG dumpcpp SOURCES diff --git a/src/activeqt/control/CMakeLists.txt b/src/activeqt/control/CMakeLists.txt index c33411d..e4b0254 100644 --- a/src/activeqt/control/CMakeLists.txt +++ b/src/activeqt/control/CMakeLists.txt @@ -4,7 +4,7 @@ ## AxServer Module: ##################################################################### -qt_add_module(AxServer +qt_internal_add_module(AxServer # special case STATIC QMAKE_MODULE_CONFIG idcidl force_import_plugins SOURCES diff --git a/src/tools/idc/.prev_CMakeLists.txt b/src/tools/idc/.prev_CMakeLists.txt new file mode 100644 index 0000000..2cdd3d6 --- /dev/null +++ b/src/tools/idc/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from idc.pro. + +##################################################################### +## idc Tool: +##################################################################### + +qt_get_tool_target_name(target_name idc) +qt_add_tool(${target_name} + BOOTSTRAP + TARGET_DESCRIPTION "Active Qt Interface Description Compiler" + SOURCES + main.cpp +) + +#### Keys ignored in scope 1:.:.:idc.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "Active Qt Interface Description Compiler" +# _OPTION = "host_build" diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt index 607404f..d21b9f0 100644 --- a/src/tools/idc/CMakeLists.txt +++ b/src/tools/idc/CMakeLists.txt @@ -4,8 +4,10 @@ ## idc Tool: ##################################################################### -qt_add_tool(idc +qt_get_tool_target_name(target_name idc) +qt_internal_add_tool(${target_name} # special case # BOOTSTRAP # special case + TARGET_DESCRIPTION "Active Qt Interface Description Compiler" TOOLS_TARGET AxContainer # special case SOURCES main.cpp |