Code

Cura 8640 PyQt6 upgrade#804

Code

Merged

Ghostkeeper merged 89 commits into5.0Ultimaker/Uranium:5.0from qt6_beyond_the_splashUltimaker/Uranium:qt6_beyond_the_splashCopy head branch name to clipboardApr 14, 2022

+795-628

Commits

Commits on Dec 28, 2021

• Search/replace Qt5->Qt6 and import from QtOpenGL where needed.

  Show description for 5392494
  rburema

  committed
  5392494

  Copy full SHA for 5392494

• Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

  Show description for 5a884cb
  rburema

  committed
  5a884cb

  Copy full SHA for 5a884cb

• Qt5->Qt6: Replace QT_ENUMS with pyqtEnum.

  Show description for b4c007a
  rburema

  committed
  b4c007a

  Copy full SHA for b4c007a

• Qt5->Qt6: Trying to fix Python 3.10 'stack overflow' issue.

  Show description for 57e94dd
  rburema

  committed
  57e94dd

  Copy full SHA for 57e94dd

• Qt5->Qt6: OpenGl-attributes and flips params register singletons.

  Show description for 289ac1b
  rburema

  committed
  289ac1b

  Copy full SHA for 289ac1b

Commits on Dec 29, 2021

• Qt5->Qt6: Partially undo attempted Python 3.10 fix.

  Show description for bdff807
  rburema

  committed
  bdff807

  Copy full SHA for bdff807

• Qt5->Qt6: Usee key-constants namespace.

  Show description for 505aa28
  rburema

  committed
  505aa28

  Copy full SHA for 505aa28

• Qt5->Qt6: Fix cause of stack-overflow errors for newer Python/Qt.

  Show description for d7dab02
  rburema

  committed
  d7dab02

  Copy full SHA for d7dab02

• Qt5->Qt6: Mostly more renamed stuff (also fix new instance HttpMgr).

  Show description for d6d07db
  rburema

  committed
  d6d07db

  Copy full SHA for d6d07db

• Qt5->Qt6: Even more renaming stuff.

  Show description for 6c80491
  rburema

  committed
  6c80491

  Copy full SHA for 6c80491

Commits on Jan 4, 2022

• Boyscouting python types

  Show description for 46119d7
  casperlamboo

  committed
  46119d7

  Copy full SHA for 46119d7

Commits on Jan 6, 2022

• Merge branch 'CURA-8591_upgrade_to_qt62' of github.com:Ultimaker/Uranium into PyQt6_upgrade

  nallath

  committed
  215034c

  Copy full SHA for 215034c

Commits on Feb 21, 2022

• Merge branch 'master' into PyQt6_upgrade

  Show description for bda3774
  Ghostkeeper

  committed
  bda3774

  Copy full SHA for bda3774

Commits on Feb 25, 2022

• Changes needed wrt how we build Arcus with Sip 6.

  Show description for 2f610f3
  rburema

  committed
  2f610f3

  Copy full SHA for 2f610f3

Commits on Feb 28, 2022

• Use Arcus as namespace

  Show description for cfb736f
  

  [email protected]

  authored and

  jellespijker

  committed
  cfb736f

  Copy full SHA for cfb736f

• Merge pull request #787 from Ultimaker/CURA-7924_sip_cmake_build

  Show description for 105cde2
  nallath

  authored
  105cde2

  Copy full SHA for 105cde2

Commits on Mar 16, 2022

• fixed moved enum OpenGLSurface Qt6

  Show description for ef575fe
  

  [email protected]

  authored and

  jellespijker

  committed
  ef575fe

  Copy full SHA for ef575fe

• get OpenGL functions from QOpenGLVersionFunctionsFactory

  Show description for 06686e0
  

  [email protected]

  authored and

  jellespijker

  committed
  06686e0

  Copy full SHA for 06686e0

Commits on Mar 24, 2022

• Merge branch 'master' into CURA-8640_PyQt6

  Show description for ada7f57
  jellespijker

  committed
  ada7f57

  Copy full SHA for ada7f57

• Use modern >=3.12 cmake find_package Python logic

  Show description for 21409e7
  

  [email protected]

  authored and

  jellespijker

  committed
  21409e7

  Copy full SHA for 21409e7

• Allow installing to a local sitelib

  Show description for 63b26bb
  

  [email protected]

  authored and

  jellespijker

  committed
  63b26bb

  Copy full SHA for 63b26bb

• fixed install dir

  Show description for f803d19
  

  [email protected]

  authored and

  jellespijker

  committed
  f803d19

  Copy full SHA for f803d19

Commits on Mar 28, 2022

• Merge branch 'master' into CURA-8640_PyQt6

  Show description for ff24dc0
  jellespijker

  committed
  ff24dc0

  Copy full SHA for ff24dc0

Commits on Mar 29, 2022

• QQuick item flags are not available by name yet in QT6.

  Show description for 30c57ba
  Joeydelarago

  committed
  30c57ba

  Copy full SHA for 30c57ba

• QTQuick.Dialogs jumped to using 6.0 in QT6

  Show description for a7cbe14
  Joeydelarago

  committed
  a7cbe14

  Copy full SHA for a7cbe14

Commits on Mar 30, 2022

• Use shader tools to generate qsb files for the RecolorImage shaders

  Show description for 60626fa
  casperlamboo

  committed
  60626fa

  Copy full SHA for 60626fa

• Remove unused import

  Show description for f69e359
  casperlamboo

  committed
  f69e359

  Copy full SHA for f69e359

• Update Qt enum API

  Show description for a8f978b
  casperlamboo

  committed
  a8f978b

  Copy full SHA for a8f978b

• Remove duplicate CheckBox component from qml_dir

  Show description for b677966
  casperlamboo

  committed
  b677966

  Copy full SHA for b677966

• wip qt changes

  casperlamboo

  committed
  d5ee4cb

  Copy full SHA for d5ee4cb

• Use correct enum

  nallath

  committed
  77012bb

  Copy full SHA for 77012bb

• Fix enums for pointing rectangle

  nallath

  committed
  ded4f36

  Copy full SHA for ded4f36

• Use the correct names for enum types

  nallath

  committed
  dbb7235

  Copy full SHA for dbb7235

• Fix opengl detection

  nallath

  committed
  6e3f5ce

  Copy full SHA for 6e3f5ce

• Use values from right enums

  nallath

  committed
  5056304

  Copy full SHA for 5056304

• Use right enum (again)

  nallath

  committed
  3a4f0eb

  Copy full SHA for 3a4f0eb

• Fix getting mouse position

  nallath

  committed
  65d85b4

  Copy full SHA for 65d85b4

• Use right enums for Texture

  nallath

  committed
  4e26023

  Copy full SHA for 4e26023

Commits on Mar 31, 2022

• Fix messageStack warning

  nallath

  committed
  8ce3b7d

  Copy full SHA for 8ce3b7d

• Use correct keyboard enums

  nallath

  committed
  97d1f34

  Copy full SHA for 97d1f34

• Fix gl creation on MacOS

  Show description for bdac697
  casperlamboo

  committed
  bdac697

  Copy full SHA for bdac697

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  casperlamboo

  committed
  73944e3

  Copy full SHA for 73944e3

• Fix restoring window geometry in Qt6

  Show description for c34549b
  Ghostkeeper

  committed
  c34549b

  Copy full SHA for c34549b

• Fix rendering

  nallath

  committed
  3e8796e

  Copy full SHA for 3e8796e

Commits on Apr 1, 2022

• Update qtMouseDevice to qt6

  nallath

  committed
  38c11d9

  Copy full SHA for 38c11d9

• Update recolor shaders programs

  Show description for 9a88a33
  casperlamboo

  committed
  9a88a33

  Copy full SHA for 9a88a33

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  casperlamboo

  committed
  aca1343

  Copy full SHA for aca1343

• Add hack to get the mouse handling working again

  nallath

  committed
  75aa73c

  Copy full SHA for 75aa73c

• Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Uranium into qt6_beyond_the_splash

  nallath

  committed
  e1377ca

  Copy full SHA for e1377ca

• manually add backendstate enum values

  Show description for bfeebf5
  nallath

  committed
  bfeebf5

  Copy full SHA for bfeebf5

• Update font weights

  Show description for 1bfbf87
  casperlamboo

  committed
  1bfbf87

  Copy full SHA for 1bfbf87

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  casperlamboo

  committed
  204ccb5

  Copy full SHA for 204ccb5

• Retrieve Qt enums correctly

  Show description for 3a21e68
  casperlamboo

  committed
  3a21e68

  Copy full SHA for 3a21e68

• Update Dialog imports to remove version

  Show description for d049159
  Joeydelarago

  committed
  d049159

  Copy full SHA for d049159

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  Joeydelarago

  committed
  c5110ea

  Copy full SHA for c5110ea

• Fix saving files

  nallath

  committed
  d7720b7

  Copy full SHA for d7720b7

Commits on Apr 4, 2022

• Fix weird scrollbar behavior

  Show description for cc7ad65
  casperlamboo

  committed
  cc7ad65

  Copy full SHA for cc7ad65

• Inheriting components don't have full access to the context of their parent in QT6 (I assume?)

  Show description for fdda29c
  Joeydelarago

  committed
  fdda29c

  Copy full SHA for fdda29c

Commits on Apr 5, 2022

• Add replacement for QT.labs.models.TableModel

  Show description for 6a27319
  Joeydelarago

  committed
  6a27319

  Copy full SHA for 6a27319

Commits on Apr 6, 2022

• LinearGradient is not available for 2d shapes in QT6

  Show description for 1e6e26e
  Joeydelarago

  committed
  1e6e26e

  Copy full SHA for 1e6e26e

• Revert debugging commit

  Show description for cc4dcb1
  Joeydelarago

  committed
  cc4dcb1

  Copy full SHA for cc4dcb1

Commits on Apr 8, 2022

• Add recolorIMage altnerative

  nallath

  committed
  2aed28e

  Copy full SHA for 2aed28e

• Fill single svg component with color rather than each path separately

  Show description for 2a93e0a
  casperlamboo

  committed
  2a93e0a

  Copy full SHA for 2a93e0a

• Replace RecolorImage with ColorImage

  Show description for afc7f8a
  casperlamboo

  committed
  afc7f8a

  Copy full SHA for afc7f8a

• Fix ColorImage for high pixel density screens

  Show description for 4aab6a9
  casperlamboo

  committed
  4aab6a9

  Copy full SHA for 4aab6a9

• Let httprequest manager follow redirects

  Show description for 6c76767
  nallath

  committed
  6c76767

  Copy full SHA for 6c76767

• Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Uranium into qt6_beyond_the_splash

  nallath

  committed
  99a4288

  Copy full SHA for 99a4288

• Add search path for the pyinstaller locations

  Show description for 2296302
  jellespijker

  committed
  2296302

  Copy full SHA for 2296302

Commits on Apr 11, 2022

• update argument order for qmlRegisterUncreatableType, the last two arguments swapped places.

  Show description for 68691e9
  Joeydelarago

  committed
  68691e9

  Copy full SHA for 68691e9

Commits on Apr 13, 2022

• Removed last remnants of RecolorImage

  Show description for c6377b5
  

  [email protected]

  authored and

  jellespijker

  committed
  c6377b5

  Copy full SHA for c6377b5

• Removed the shaders for the RecolorImage

  Show description for 671fa49
  

  [email protected]

  authored and

  jellespijker

  committed
  671fa49

  Copy full SHA for 671fa49

• Update Copyrights

  Show description for 0568e9c
  

  [email protected]

  authored and

  jellespijker

  committed
  0568e9c

  Copy full SHA for 0568e9c

• Update UM/Qt/Bindings/ApplicationProxy.py

  Show description for bc0e6b6
  

  Joeydelarago

  and

  jellespijker

  authored
  bc0e6b6

  Copy full SHA for bc0e6b6

• Update UM/ColorImage.py

  Show description for a07bd2e
  

  Joeydelarago

  and

  jellespijker

  authored
  a07bd2e

  Copy full SHA for a07bd2e

• Update UM/ColorImage.py

  Show description for 7006794
  

  Joeydelarago

  and

  jellespijker

  authored
  7006794

  Copy full SHA for 7006794

• Apply most harmless suggestions from code review.

  Show description for bb37457
  

  rburema

  and

  jellespijker

  authored
  bb37457

  Copy full SHA for bb37457

• Add Typing to ColorImage.py

  Joeydelarago

  committed
  708e388

  Copy full SHA for 708e388

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  Joeydelarago

  committed
  fe2d53f

  Copy full SHA for fe2d53f

• Remove debug return

  Joeydelarago

  committed
  b73f688

  Copy full SHA for b73f688

• Apply suggestions from code review

  Show description for 10b83ca
  

  Joeydelarago

  and

  jellespijker

  authored
  10b83ca

  Copy full SHA for 10b83ca

• Apply suggestions from code review

  Show description for 44f7b72
  

  Joeydelarago

  and

  jellespijker

  authored
  44f7b72

  Copy full SHA for 44f7b72

• Force redraw when something in colorImage is changed

  Show description for da53597
  nallath

  committed
  da53597

  Copy full SHA for da53597

• Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Uranium into qt6_beyond_the_splash

  nallath

  committed
  f4cf9eb

  Copy full SHA for f4cf9eb

• Use right enum for messagebox

  nallath

  committed
  5f65288

  Copy full SHA for 5f65288

• Codestyle fixes

  nallath

  committed
  7bb8210

  Copy full SHA for 7bb8210

Commits on Apr 14, 2022

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  jellespijker

  committed
  52a7379

  Copy full SHA for 52a7379

• Revert "Add Typing to ColorImage.py"

  Show description for 303bbbf
  Joeydelarago

  committed
  303bbbf

  Copy full SHA for 303bbbf

• Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash

  jellespijker

  committed
  94dea9a

  Copy full SHA for 94dea9a

• Revert "Revert "Add Typing to ColorImage.py""

  Show description for b7438e9
  jellespijker

  committed
  b7438e9

  Copy full SHA for b7438e9