Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OpenFlipper
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

6200b638

Commit 6200b638 authored 9 years ago by Jan Möbius

Downloads
- Patches
- Plain Diff

Revert "Merge branch 'featureQt5.6Support' into 'master'"

This reverts merge request !92

parent b837756e

No related branches found

No related tags found

Loading

Changes 13

Show whitespace changes

Inline Side-by-side

Showing

Core/Core.cc 1 addition, 1 deletion

Core/Core.cc
CoreApp/CMakeLists.txt 0 additions, 8 deletions

CoreApp/CMakeLists.txt
Documentation/DeveloperHelpSources/building.docu 0 additions, 1 deletion

Documentation/DeveloperHelpSources/building.docu
OpenFlipper.cc 2 additions, 6 deletions

OpenFlipper.cc
PluginLib/CMakeLists.txt 0 additions, 3 deletions

PluginLib/CMakeLists.txt
cmake/plugin.cmake 1 addition, 28 deletions

cmake/plugin.cmake
common/glew_wrappers.cc 15 additions, 8 deletions

common/glew_wrappers.cc
common/glew_wrappers.hh 2 additions, 2 deletions

common/glew_wrappers.hh
widgets/coreWidget/About.cc 5 additions, 3 deletions

widgets/coreWidget/About.cc
widgets/coreWidget/CoreWidget.cc 4 additions, 0 deletions

widgets/coreWidget/CoreWidget.cc
widgets/coreWidget/CoreWidget.hh 1 addition, 0 deletions

widgets/coreWidget/CoreWidget.hh
widgets/glWidget/QtGLGraphicsScene.cc 4 additions, 2 deletions

widgets/glWidget/QtGLGraphicsScene.cc
widgets/glWidget/simpleGLGraphicsScene.cc 2 additions, 2 deletions

widgets/glWidget/simpleGLGraphicsScene.cc

with 37 additions and 64 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