diff options
author | Pasi Keränen <pasi.keranen@qt.io> | 2019-06-05 13:22:33 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@qt.io> | 2019-06-10 21:22:35 +0300 |
commit | fa46a1dc716c499b5eefdfd8f0cfcfc8ac303937 (patch) | |
tree | 61f7f6eed72822cf39a52769dfaba24d1bde9522 /src/Runtime/ogl-runtime/tools/viewer/viewer.pro | |
parent | fe7649841f68c6fe99bf08e477df77770c7dffa0 (diff) |
Switch to qt3dstudio/ogl-runtime submodule
Module config change so that ogl-runtime builds from submodule.
Task-number: QT3DS-3600
Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Diffstat (limited to 'src/Runtime/ogl-runtime/tools/viewer/viewer.pro')
m--------- | src/Runtime/ogl-runtime | 0 | ||||
-rw-r--r-- | src/Runtime/ogl-runtime/tools/viewer/viewer.pro | 49 |
2 files changed, 0 insertions, 49 deletions
diff --git a/src/Runtime/ogl-runtime b/src/Runtime/ogl-runtime new file mode 160000 +Subproject 2025912174c4cf99270b7439ec3b021e1d089ae diff --git a/src/Runtime/ogl-runtime/tools/viewer/viewer.pro b/src/Runtime/ogl-runtime/tools/viewer/viewer.pro deleted file mode 100644 index cad56640..00000000 --- a/src/Runtime/ogl-runtime/tools/viewer/viewer.pro +++ /dev/null @@ -1,49 +0,0 @@ -include($$PWD/../../commoninclude.pri) - -TEMPLATE = app -TARGET = Qt3DViewer -QT += qml quickcontrols2 studio3d-private - -INCLUDEPATH += $$PWD/../../src/api/studio3dqml -INCLUDEPATH += $$PWD/../../src/api/studio3d - -RESOURCES += Viewer.qrc -RC_ICONS = resources/images/3D-studio-viewer.ico - -ICON = resources/images/viewer.icns - -SOURCES += \ - $$PWD/../../src/api/studio3dqml/q3dsstudio3d.cpp \ - $$PWD/../../src/api/studio3dqml/q3dsrenderer.cpp \ - $$PWD/../../src/api/studio3dqml/q3dspresentationitem.cpp \ - main.cpp \ - viewer.cpp \ - remotedeploymentreceiver.cpp - -HEADERS += \ - $$PWD/../../src/api/studio3dqml/q3dsstudio3d_p.h \ - $$PWD/../../src/api/studio3dqml/q3dsrenderer_p.h \ - $$PWD/../../src/api/studio3dqml/q3dspresentationitem_p.h \ - viewer.h \ - remotedeploymentreceiver.h - -android: { -SOURCES += \ - $$PWD/../../src/api/studio3d/q3dsviewersettings.cpp \ - $$PWD/../../src/api/studio3d/q3dspresentation.cpp \ - $$PWD/../../src/api/studio3d/q3dsdatainput.cpp - -HEADERS += \ - $$PWD/../../src/api/studio3d/q3dsviewersettings.h \ - $$PWD/../../src/api/studio3d/q3dspresentation.h \ - $$PWD/../../src/api/studio3d/q3dsdatainput.h -} - -LIBS += \ - -lqt3dsopengl$$qtPlatformTargetSuffix() \ - -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() - -macos:QMAKE_RPATHDIR += @executable_path/../../../../lib - -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target |