diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-03 14:00:07 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-03 14:01:18 +0300 |
| commit | 01cfc8025119609803b3fc00b1e8ca5bc56e84d0 (patch) | |
| tree | c41480bbb06377f3a79d13c465a53435cccb9de4 /src/Viewer/Qt3DViewer/Qt3DViewer.pro | |
| parent | c36739204786bd90df6e2ef5a8be78c980240bdd (diff) | |
| parent | 089d283afb8cde5024e60c29eeeeefc5c3c80543 (diff) | |
Merge branch '2.4'
Change-Id: Ib7de8e52a477c06599ced87bb973a5abd25549c4
Diffstat (limited to 'src/Viewer/Qt3DViewer/Qt3DViewer.pro')
| -rw-r--r-- | src/Viewer/Qt3DViewer/Qt3DViewer.pro | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/src/Viewer/Qt3DViewer/Qt3DViewer.pro b/src/Viewer/Qt3DViewer/Qt3DViewer.pro deleted file mode 100644 index 25345d3c..00000000 --- a/src/Viewer/Qt3DViewer/Qt3DViewer.pro +++ /dev/null @@ -1,49 +0,0 @@ -include($$PWD/../../Runtime/commoninclude.pri) - -TEMPLATE = app -TARGET = Qt3DViewer -QT += qml quickcontrols2 studio3d-private - -INCLUDEPATH += $$PWD/../../Runtime/api/studio3dqml -INCLUDEPATH += $$PWD/../../Runtime/api/studio3d - -RESOURCES += Viewer.qrc -RC_ICONS = resources/images/3D-studio-viewer.ico - -ICON = resources/images/viewer.icns - -SOURCES += \ - $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d.cpp \ - $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer.cpp \ - $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem.cpp \ - main.cpp \ - viewer.cpp \ - remotedeploymentreceiver.cpp - -HEADERS += \ - $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d_p.h \ - $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer_p.h \ - $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem_p.h \ - viewer.h \ - remotedeploymentreceiver.h - -android: { -SOURCES += \ - $$PWD/../../Runtime/api/studio3d/q3dsviewersettings.cpp \ - $$PWD/../../Runtime/api/studio3d/q3dspresentation.cpp \ - $$PWD/../../Runtime/api/studio3d/q3dsdatainput.cpp - -HEADERS += \ - $$PWD/../../Runtime/api/studio3d/q3dsviewersettings.h \ - $$PWD/../../Runtime/api/studio3d/q3dspresentation.h \ - $$PWD/../../Runtime/api/studio3d/q3dsdatainput.h -} - -LIBS += \ - -lqt3dsopengl$$qtPlatformTargetSuffix() \ - -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() - -macos:QMAKE_RPATHDIR += @executable_path/../../../../lib - -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target |