Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

98cc67c4

Unverified Commit 98cc67c4 authored 6 years ago by Dmitri Naumov Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #2432 from endJunction/UseQVtkOpenGlWidget

Use QVtkOpenGLWidget

parents 5fc667ab e539de27

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Applications/DataExplorer/VtkVis/VisualizationWidget.cpp 20 additions, 17 deletions

Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui 3 additions, 3 deletions

Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
Applications/DataExplorer/main.cpp 5 additions, 0 deletions

Applications/DataExplorer/main.cpp
CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
Jenkinsfile 1 addition, 1 deletion

Jenkinsfile
scripts/cmake/ConanSetup.cmake 0 additions, 1 deletion

scripts/cmake/ConanSetup.cmake
scripts/cmake/packaging/PackagingMac.cmake 2 additions, 2 deletions

scripts/cmake/packaging/PackagingMac.cmake
scripts/cmake/packaging/PackagingMacros.cmake 1 addition, 0 deletions

scripts/cmake/packaging/PackagingMacros.cmake
scripts/cmake/packaging/PackagingWin.cmake 2 additions, 2 deletions

scripts/cmake/packaging/PackagingWin.cmake

with 35 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment