diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-06-24 16:12:25 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-06-24 23:24:31 +0200 |
| commit | 10669911b7beac620989d69653334fb6ee477744 (patch) | |
| tree | 1778f515a2421a6df3db61290952a95438cc1057 | |
| parent | 1d164c6dcbda5906d0e10137e81ea8f853e997b8 (diff) | |
Use qt_enable_autogen_tool to explicitly enable AUTOMOC
Otherwise it will depend on the moc executable existing already during
configuration/generation.
Change-Id: I9b3f0ef42ba6ecf5eeb59e92fd6dad553c5c47af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt | 19 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt | 4 |
2 files changed, 22 insertions, 1 deletions
diff --git a/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4933b9271e --- /dev/null +++ b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from foreign.pro. + +##################################################################### +## foreign Generic Library: +##################################################################### + +qt_add_cmake_library(foreign + STATIC + SOURCES + foreign.cpp foreign.h + PUBLIC_LIBRARIES + Qt::Core +) + +#### Keys ignored in scope 1:.:.:foreign.pro:<TRUE>: +# TEMPLATE = "lib" + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt index 1d60c33428..cc85c404c5 100644 --- a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt @@ -11,8 +11,10 @@ qt_add_cmake_library(foreign PUBLIC_LIBRARIES Qt::Core ) -set_property(TARGET foreign PROPERTY AUTOMOC ON) +# special case begin +qt_enable_autogen_tool(foreign "moc" ON) qt6_generate_meta_types_json_file(foreign) +# special case end #### Keys ignored in scope 1:.:.:foreign.pro:<TRUE>: # TEMPLATE = "lib" |