Skip to content

synchronize master with unstable branch

Martin Schultz requested to merge unstable into master

pulls the following changes from unstable branch into master branch:

  • fixed glerror stack underflow when taking a snapshot
  • added QOpenGLDebuglogger from QOpenGL branch
  • changed required version of Qt from 5.5 >= Qt >= 4.8.6 to 5.9 >= Qt >= 5.5.1

please also synchronize unstable branch of OpenFlipper submodule with master from this MR https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper/merge_requests/38

closes #126 (closed)

Also adds changes for CI to avoid redundant cloning, etc.

i changed the setting to remove the source branch after merge. i cannot keep up with checking out submodules tracking and migrating merges, etc. Took me about an hour to check all submodules when i merged the new cmake path from the master branch.

please merge and remove. if this one passes please also merge https://graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper/merge_requests/64 and https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/PluginCollection-Renderers/merge_requests/2 and https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Type-QtWidget/merge_requests/2 and https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-Render-Classic/merge_requests/2

Edited by Martin Schultz

Merge request reports