diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:33:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:42 +0000 |
| commit | 30917cd20ce1e40482e967fdafb5f8b95a62b640 (patch) | |
| tree | 090589f0c9984fc5a0715844fdfa7b993551bab6 /src/qmlworkerscript | |
| parent | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (diff) | |
Regenerate required projects after dev -> wip/cmake merge
Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 51b6df5ea3..c78d4065f3 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -93,3 +93,7 @@ extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGRE #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" +add_qt_docs(QmlWorkerScript + doc/qtqmlworkerscript.qdocconf +) + diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 9abfb586ba..893da25b6b 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -93,3 +93,7 @@ extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGRE #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" +add_qt_docs(QmlWorkerScript + doc/qtqmlworkerscript.qdocconf +) + |