Code

Feature/qt4 qt5#80

Code

Open

pierrewillenbrockdfki wants to merge 66 commits intomasterrock-core/gui-vizkit3d:masterfrom feature/qt4-qt5rock-core/gui-vizkit3d:feature/qt4-qt5Copy head branch name to clipboard

+654-124

Commits

Commits on Dec 2, 2021

• Inital qt5 port

  

  Dennis Hemker

  committed
  e1fd10a

  Copy full SHA for e1fd10a

• Update manifest deps to qt5

  

  Dennis Hemker

  committed
  c56461d

  Copy full SHA for c56461d

Commits on Mar 14, 2022

• Remove remaining dependencies to qt4

  chhtz

  committed
  617683c

  Copy full SHA for 617683c

Commits on Mar 16, 2022

• Merge pull request #51 from chhtz/feature/qt5

  Show description for e96ccb6
  skasperski

  authored
  e96ccb6

  Copy full SHA for e96ccb6

Commits on Mar 25, 2022

• Need to remove the prefixes, since QtPropertyBrowser already has it as part of the exported include path

  chhtz

  committed
  81d84de

  Copy full SHA for 81d84de

• Vizkit3DPlugin.hpp depends on Qt5Widgets

  chhtz

  committed
  c095500

  Copy full SHA for c095500

• Merge pull request #52 from chhtz/feature/qt5

  Show description for f2dc8c4
  planthaber

  authored
  f2dc8c4

  Copy full SHA for f2dc8c4

• Merge remote-tracking branch 'autobuild/master' into feature/qt5

  pierrewillenbrockdfki

  committed
  0898561

  Copy full SHA for 0898561

• Further porting for Qt5

  pierrewillenbrockdfki

  committed
  ece8a0b

  Copy full SHA for ece8a0b

• IID is supposed to point to the interface that has been implemented

  Show description for 3ac06d2
  pierrewillenbrockdfki

  committed
  3ac06d2

  Copy full SHA for 3ac06d2

• Prevent calling of osgViz::update() when not visible

  Show description for 9f411a4
  pierrewillenbrockdfki

  committed
  9f411a4

  Copy full SHA for 9f411a4

• Stop using osgviz::WindowManager and osgviz::Window

  Show description for e8b0cfa
  pierrewillenbrockdfki

  committed
  e8b0cfa

  Copy full SHA for e8b0cfa

• require Qt::UiPlugin

  pierrewillenbrockdfki

  committed
  1c858fe

  Copy full SHA for 1c858fe

• openscenegraph-osgQt renamed to openscenegraph-osgQt5

  pierrewillenbrockdfki

  committed
  6af0401

  Copy full SHA for 6af0401

• Merge pull request #53 from pierrewillenbrockdfki/feature/qt5

  Show description for 5d4f1e6
  planthaber

  authored
  5d4f1e6

  Copy full SHA for 5d4f1e6

• Revert "openscenegraph-osgQt renamed to openscenegraph-osgQt5"

  Show description for 5d999be
  pierrewillenbrockdfki

  committed
  5d999be

  Copy full SHA for 5d999be

• Revert "openscenegraph-osgQt renamed to openscenegraph-osgQt5"

  Show description for 3ed8e0b
  planthaber

  committed
  3ed8e0b

  Copy full SHA for 3ed8e0b

• Merge pull request #54 from pierrewillenbrockdfki/feature/qt5

  Show description for 1d7f014
  planthaber

  authored
  1d7f014

  Copy full SHA for 1d7f014

• find boost only once

  planthaber

  committed
  23d8d28

  Copy full SHA for 23d8d28

• Qt::UiPlugin -> Qt5::UiPlugin

  planthaber

  committed
  982159f

  Copy full SHA for 982159f

• Merge branch 'feature/qt5' of https://github.com/rock-core/gui-vizkit3d into feature/qt5

  planthaber

  committed
  dfd4fff

  Copy full SHA for dfd4fff

• use cmake targets as libs

  planthaber

  committed
  39a1458

  Copy full SHA for 39a1458

• Make Qts moc look at the headers needing MOCing

  Show description for 8bab937
  pierrewillenbrockdfki

  committed
  8bab937

  Copy full SHA for 8bab937

• Merge pull request #55 from pierrewillenbrockdfki/feature/qt5

  Show description for 663fc0a
  planthaber

  authored
  663fc0a

  Copy full SHA for 663fc0a

Commits on Mar 28, 2022

• osgQt renamed to openscenegraph-osgQt5

  pierrewillenbrockdfki

  committed
  d4e36a5

  Copy full SHA for d4e36a5

Commits on Apr 28, 2022

• Put the headers back in a HEADERS section

  Show description for ecbf40d
  pierrewillenbrockdfki

  committed
  ecbf40d

  Copy full SHA for ecbf40d

Commits on May 2, 2022

• Merge pull request #57 from pierrewillenbrockdfki/feature/qt5

  Show description for a838667
  planthaber

  authored
  a838667

  Copy full SHA for a838667

Commits on May 5, 2022

• fix: catched segmentation failed, if string property can not be set in PropertyBrowserWidget

  

  Image Builder

  committed
  f507713

  Copy full SHA for f507713

• Merge pull request #58 from annaborn/feature/qt5

  Show description for 2e976da
  planthaber

  authored
  2e976da

  Copy full SHA for 2e976da

Commits on May 9, 2022

• Put the headers back in a HEADERS section

  Show description for 798121d
  pierrewillenbrockdfki

  committed
  798121d

  Copy full SHA for 798121d

• Make this package depend on osg_qt5

  Show description for d0a4b01
  pierrewillenbrockdfki

  committed
  d0a4b01

  Copy full SHA for d0a4b01

Commits on May 19, 2022

• Merge pull request #59 from pierrewillenbrockdfki/feature/qt5

  Show description for 66d5cc2
  planthaber

  authored
  66d5cc2

  Copy full SHA for 66d5cc2

• osg_qt5 => gui/osg_qt5

  pierrewillenbrockdfki

  committed
  a9ee2ca

  Copy full SHA for a9ee2ca

• Merge pull request #63 from pierrewillenbrockdfki/feature/qt5

  Show description for d405d4d
  planthaber

  authored
  d405d4d

  Copy full SHA for d405d4d

Commits on May 23, 2022

• Improve documentation for VizkitQtPlugin

  pierrewillenbrockdfki

  committed
  29ce929

  Copy full SHA for 29ce929

• Revert CMakeLists.txt changes from "Further porting for Qt5"

  Show description for 0ecba30
  pierrewillenbrockdfki

  committed
  0ecba30

  Copy full SHA for 0ecba30

• Revert to the boost detection method from master

  pierrewillenbrockdfki

  committed
  010213b

  Copy full SHA for 010213b

• Merge pull request #64 from pierrewillenbrockdfki/feature/qt5

  Show description for 5643c2c
  planthaber

  authored
  5643c2c

  Copy full SHA for 5643c2c

Commits on Nov 18, 2022

• fis test compilation with qt5

  planthaber

  committed
  c8c2d25

  Copy full SHA for c8c2d25

Commits on Nov 23, 2022

• init windows/views the osgviz way

  Show description for 5b033f5
  planthaber

  committed
  5b033f5

  Copy full SHA for 5b033f5

Commits on Feb 21, 2023

• Add functions to enable or disable properties

  Show description for 5038cfc
  haider8645

  committed
  5038cfc

  Copy full SHA for 5038cfc

Commits on Feb 24, 2023

• Add dynamic properties to the property browser

  haider8645

  committed
  4d71cf5

  Copy full SHA for 4d71cf5

Commits on Feb 27, 2023

• Make qtpropertybrowser header relative to QtPropertyBrowser to be able to find it

  haider8645

  committed
  3c803f1

  Copy full SHA for 3c803f1

Commits on Mar 1, 2023

• Merge pull request #68 from haider8645/custom_gui

  Show description for 09c4bdf
  planthaber

  authored
  09c4bdf

  Copy full SHA for 09c4bdf

Commits on Mar 2, 2023

• make the root of the transformer display selectable

  Show description for c58b2ac
  

  planthaber

  authored and

  haider8645

  committed
  c58b2ac

  Copy full SHA for c58b2ac

• Merge pull request #69 from haider8645/feature/qt5_tfroot

  Show description for b98aac0
  planthaber

  authored
  b98aac0

  Copy full SHA for b98aac0

Commits on Mar 8, 2023

• Revert "Make qtpropertybrowser header relative to QtPropertyBrowser to be able to find it"

  Show description for f440009
  pierrewillenbrockdfki

  committed
  f440009

  Copy full SHA for f440009

Commits on Mar 9, 2023

• Use DEPS_TARGET with QtPropertyBrowser, fix .pc.in

  Show description for 8363eea
  pierrewillenbrockdfki

  committed
  8363eea

  Copy full SHA for 8363eea

Commits on Mar 10, 2023

• Merge pull request #70 from pierrewillenbrockdfki/fix-qt5-pc

  Show description for a40c4f0
  planthaber

  authored
  a40c4f0

  Copy full SHA for a40c4f0

Commits on May 24, 2023

• #ifdef style merge of remote-tracking branch 'autobuild/feature/qt5' into feature/qt4-qt5

  pierrewillenbrockdfki

  committed
  9d34dd4

  Copy full SHA for 9d34dd4

• Split VizkitQtPlugin() macro in two, one for header, one for source bits

  Show description for 53b00e8
  pierrewillenbrockdfki

  committed
  53b00e8

  Copy full SHA for 53b00e8

• Create two versions of each target, one for qt4, one for qt5

  pierrewillenbrockdfki

  committed
  c935e08

  Copy full SHA for c935e08

• Look for plugins named lib*-viz-qt5.() if compiled for qt5

  Show description for 8d87364
  pierrewillenbrockdfki

  committed
  8d87364

  Copy full SHA for 8d87364

• Reactivate the initial changeCameraView for qt5

  Show description for 5595213
  pierrewillenbrockdfki

  committed
  5595213

  Copy full SHA for 5595213

Commits on Aug 11, 2023

• Add missing viz-qt5 pkgconfig file

  pierrewillenbrockdfki

  committed
  4408ddc

  Copy full SHA for 4408ddc

Commits on Sep 28, 2023

• Merge remote-tracking branch 'autobuild/master' into feature/qt4-qt5

  pierrewillenbrockdfki

  committed
  14b05ef

  Copy full SHA for 14b05ef

Commits on Apr 10, 2024

• Merge remote-tracking branch 'rock.core/master' into feature/qt4-qt5

  pierrewillenbrockdfki

  committed
  9edd6e0

  Copy full SHA for 9edd6e0

• Mark qt5 and qt4 side dependencies optional

  Show description for d514f91
  pierrewillenbrockdfki

  committed
  d514f91

  Copy full SHA for d514f91

Commits on Aug 8, 2024

• Adjust for finding external QtPropertyBrowser with -qt5 suffix

  pierrewillenbrockdfki

  committed
  4ec501d

  Copy full SHA for 4ec501d

• Setup qt4 version of vizkit3d to link against external qtpropertybrowser

  pierrewillenbrockdfki

  committed
  5882e09

  Copy full SHA for 5882e09

Commits on Nov 14, 2024

• Remove osg_qt5 dependency since it has been merged into osg_qt4

  Show description for 1373af2
  pierrewillenbrockdfki

  committed
  1373af2

  Copy full SHA for 1373af2

Commits on Dec 3, 2024

• Mark gui/qtpropertybrowser non-optional

  Show description for adb5e20
  pierrewillenbrockdfki

  committed
  adb5e20

  Copy full SHA for adb5e20

Commits on Jan 22, 2025

• Remove Q_OBJECT from VizkitQtPlugin macro

  Show description for 2f30866
  pierrewillenbrockdfki

  committed
  2f30866

  Copy full SHA for 2f30866

• Replace qt4 VizkitQtPlugin macro impl with the part macros usable with qt5

  pierrewillenbrockdfki

  committed
  cbadf07

  Copy full SHA for cbadf07

Commits on Jan 28, 2025

• fix name-based plugin loading for qt5

  planthaber

  committed
  cfb69d1

  Copy full SHA for cfb69d1

Commits on Feb 20, 2025

• Add a bit of a porting guide for moving plugins to be qt5 compatible

  pierrewillenbrockdfki

  committed
  4702220

  Copy full SHA for 4702220