diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
| commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
| tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/qmlworkerscript | |
| parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) | |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 215231b5b8..f9cf2dbd5f 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_module(QmlWorkerScript SOURCES - qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h qquickworkerscript.cpp qquickworkerscript_p.h qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h qv4serialize.cpp qv4serialize_p.h @@ -45,6 +44,12 @@ qt_add_module(QmlWorkerScript Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QML_IMPORT_NAME = "QtQml.WorkerScript" + ## Scopes: ##################################################################### diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 297e0404d9..1f61555bd1 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_module(QmlWorkerScript SOURCES - qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h qquickworkerscript.cpp qquickworkerscript_p.h qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h qv4serialize.cpp qv4serialize_p.h @@ -45,6 +44,12 @@ qt_add_module(QmlWorkerScript Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QML_IMPORT_NAME = "QtQml.WorkerScript" + ## Scopes: ##################################################################### |