diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-09-10 09:01:31 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-09-10 10:18:04 +0000 |
| commit | 4193fc4f00c2e687ca82de589603c7fa133bff50 (patch) | |
| tree | 285051fe9b7a3a8f891b12fb1d83e8cd23d4607a /qt3dstudio.pro | |
| parent | 7128f00e5e38b5de229e75f5386f3bd3fe9806d2 (diff) | |
Remove legacy viewer
Task-number: QT3DS-2291
Change-Id: I0a11dfc1d69e4844e67476b60bc40da99c6ad12a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'qt3dstudio.pro')
| -rw-r--r-- | qt3dstudio.pro | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/qt3dstudio.pro b/qt3dstudio.pro index b5b3fe5e..7360423e 100644 --- a/qt3dstudio.pro +++ b/qt3dstudio.pro @@ -28,32 +28,6 @@ load(qt_parts) deploytool = windeployqt exesuffix = .exe - # windeployqt will get confused when deploying viewer 1.0, because some of studio - # libraries it links detect as Qt libraries due to their naming scheme. - # Since viewer and studio have mostly identical Qt dependencies and both are deployed - # to the same directory, we can just omit deployment of viewer in windows and - # deploy the missing qml bits separately. - - # Viewer 1.0 needs the studio qml plugin - # The assumption is that we are deploying release build in case both are built - release { - QML_FILE_R = QtStudio3D/declarative_qtstudio3d.dll - QMAKE_EXTRA_TARGETS += deployReleaseQml - deployTarget.depends += deployReleaseQml - deployReleaseQml.depends = mkStudioQmlDir - deployReleaseQml.commands = \ - $$QMAKE_COPY $$shell_quote($$shell_path($$OUT_PWD/qml/$$QML_FILE_R)) \ - $$shell_quote($$shell_path(\$(DEPLOY_DIR)/$$QML_FILE_R)) - } else { - QML_FILE_D = QtStudio3D/declarative_qtstudio3dd.dll - QMAKE_EXTRA_TARGETS += deployDebugQml - deployTarget.depends += deployDebugQml - deployDebugQml.depends += mkStudioQmlDir - deployDebugQml.commands = \ - $$QMAKE_COPY $$shell_quote($$shell_path($$OUT_PWD/qml/$$QML_FILE_D)) \ - $$shell_quote($$shell_path(\$(DEPLOY_DIR)/$$QML_FILE_D)) - } - # copy QtStudio3D.dll release { QTSTUDIO3D_LIB = Qt5Studio3D.dll @@ -66,18 +40,6 @@ load(qt_parts) $$QMAKE_COPY $$shell_quote($$shell_path( \ $$OUT_PWD/bin/$$QTSTUDIO3D_LIB)) \ $$shell_quote($$shell_path($$[QT_INSTALL_BINS]/$$QTSTUDIO3D_LIB)) - - QMLDIR_FILE = QtStudio3D/qmldir - QMAKE_EXTRA_TARGETS += deployQmldir - deployTarget.depends += deployQmldir - deployQmldir.depends += mkStudioQmlDir - deployQmldir.commands = \ - $$QMAKE_COPY $$shell_quote($$shell_path($$OUT_PWD/qml/$$QMLDIR_FILE)) \ - $$shell_quote($$shell_path(\$(DEPLOY_DIR)/$$QMLDIR_FILE)) - - QMAKE_EXTRA_TARGETS += mkStudioQmlDir - mkStudioQmlDir.commands = \ - $$sprintf($$QMAKE_MKDIR_CMD, $$shell_quote($$shell_path(\$(DEPLOY_DIR)/QtStudio3D))) } qtPrepareTool(DEPLOY_TOOL, $$deploytool) @@ -87,13 +49,6 @@ load(qt_parts) $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/Qt3DStudio$${exesuffix}) \ -qmldir=$$shell_quote($$PWD/src/Authoring/Studio/Palettes) $$EXTRA_DEPLOY_OPTIONS - macos { - # Viewer 1.0 - deployTarget.commands += && \ - $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/Qt3DViewer$${exesuffix}) \ - $$EXTRA_DEPLOY_OPTIONS - } - greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) { # Viewer 2.0 win32 { |