diff options
| author | Kimmo Leppälä <kimmo.leppala@qt.io> | 2018-08-30 14:55:44 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2018-09-04 16:11:14 +0000 |
| commit | cbda4830ef2b6ffdc840f8992b66164f210f3507 (patch) | |
| tree | a50946678cef48f9f3928777d2003fdc85782eb9 /qt3dstudio.pro | |
| parent | 281aef5978f9e0e311727b338d4734e7e87f4e46 (diff) | |
Add missing QtQuick2 plugins to Viewer 2 app bundle
Although Viewer 2 doesn't depend on QtQuick2 the plugins are required when
using qmlstreams.
Task-number: QT3DS-2058
Change-Id: I2a6a2a5c323d42e98aafeef911f1ee9f4c09f554
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'qt3dstudio.pro')
| -rw-r--r-- | qt3dstudio.pro | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qt3dstudio.pro b/qt3dstudio.pro index 357bbf62..b5b3fe5e 100644 --- a/qt3dstudio.pro +++ b/qt3dstudio.pro @@ -78,13 +78,11 @@ load(qt_parts) QMAKE_EXTRA_TARGETS += mkStudioQmlDir mkStudioQmlDir.commands = \ $$sprintf($$QMAKE_MKDIR_CMD, $$shell_quote($$shell_path(\$(DEPLOY_DIR)/QtStudio3D))) - - # Deploy viewer 1.0 qml dependencies when deploying studio - EXTRA_DEPLOY_OPTIONS = -qmldir=$$shell_quote($$PWD/src/Viewer/Qt3DViewer) } qtPrepareTool(DEPLOY_TOOL, $$deploytool) + EXTRA_DEPLOY_OPTIONS = -qmldir=$$shell_quote($$PWD/src/shared/dummyqml) deployTarget.commands = \ $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/Qt3DStudio$${exesuffix}) \ -qmldir=$$shell_quote($$PWD/src/Authoring/Studio/Palettes) $$EXTRA_DEPLOY_OPTIONS @@ -93,7 +91,7 @@ load(qt_parts) # Viewer 1.0 deployTarget.commands += && \ $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/Qt3DViewer$${exesuffix}) \ - -qmldir=$$shell_quote($$PWD/src/Viewer/Qt3DViewer) + $$EXTRA_DEPLOY_OPTIONS } greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) { @@ -116,8 +114,8 @@ load(qt_parts) $$QMAKE_COPY $$shell_quote($$shell_path( \ $$OUT_PWD/src/Runtime/qt3d-runtime/bin/$$RUNTIME2_LIB)) \ $$shell_quote($$shell_path($$[QT_INSTALL_BINS]/$$RUNTIME2_LIB)) - EXTRA_DEPLOY_OPTIONS = --qml --quick } + deployTarget.commands += && \ $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/q3dsviewer$${exesuffix}) \ $$EXTRA_DEPLOY_OPTIONS |