migrated to qt6
I have just migrated a fork of Gittyup to Qt6.
It compiles (without deprecation warnings) and seems to run, but is still mostly untested (on Manjaro-KDE-Linux only).
@exactly-one-kas do you think we still need win32?
@exactly-one-kas Can you test and build this branch on Arch Linux?
Mac: change CustomTheme_mac.mm use float
Win: D:/a/Gittyup/Gittyup/src/index/indexer.cpp:61:3: error: no matching function for call to 'CreateDirectoryW' CreateDirectory(dir, NULL);
Is there anybody which can fix the build error in my Qt6 branch? #429
Is there still stuff that needs testing (on Mac)?
Is there anybody which can fix the build error in my Qt6 branch? #429
Is there still stuff that needs testing (on Mac)?
Yes can you test if it is working? On windows the theme looks wrong this is another point.
Needs to be tested:
- [ ] MacOs
Needs to be fixed:
- [ ] Windows theme looks wrong
Thanks for testing
I get the following error when opening Gittyup build https://github.com/Murmele/Gittyup/actions/runs/6725527056 on macOS 14.1 (Rosetta2):
dyld[86107]: Library not loaded: @rpath/QtConcurrent.framework/Versions/A/QtConcurrent
Referenced from: <B62A89B5-9AEE-3037-8535-B06DF4911B33> /Volumes/Gittyup/gittyup.app/Contents/MacOS/gittyup
Reason: tried: '/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Volumes/Gittyup/gittyup.app/Contents/MacOS/../Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Volumes/Gittyup/gittyup.app/Contents/MacOS/../Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Library/Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Library/Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file, not in dyld cache)
[1] 86107 abort /Volumes/Gittyup/gittyup.app/Contents/MacOS/gittyup
I get the following error when opening Gittyup build https://github.com/Murmele/Gittyup/actions/runs/6725527056 on macOS 14.1 (Rosetta2):
dyld[86107]: Library not loaded: @rpath/QtConcurrent.framework/Versions/A/QtConcurrent Referenced from: <B62A89B5-9AEE-3037-8535-B06DF4911B33> /Volumes/Gittyup/gittyup.app/Contents/MacOS/gittyup Reason: tried: '/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Volumes/Gittyup/gittyup.app/Contents/MacOS/../Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/usr/local/qt/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Volumes/Gittyup/gittyup.app/Contents/MacOS/../Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/Library/Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file), '/System/Library/Frameworks/QtConcurrent.framework/Versions/A/QtConcurrent' (no such file, not in dyld cache) [1] 86107 abort /Volumes/Gittyup/gittyup.app/Contents/MacOS/gittyup
Thanks for the feedback. I have to set up a virtual machine to check it out.
@wolfseifert Can you give me rights to push?
I added Julian Hackinger as collaborator.
Is this only on MacOS?
Is the mr is rebased on the latest master?
For appimage: libxcb-cursor0 must be installed as well, otherwise the linux ci build fails
KDE on Fedora Linux:
Theme problems on Linux:
- Branch filter text has wrong color
- Top-right search bar has wrong text color
MacOS:
Theme problems on MacOS:
- highlighting of selected Repo only slightly visible (sshTools is highlighted)
-
Use OursandUse Theirsbutton not colored
.git name problem:
- Happens only update from Gittyup 1.3.0 to the QT6 Version, newly added repos are fine.
- After rebase there is a recent repo
.gitas well, this was not the case before the rebase and this repo was not in the recent repos on Gittyup 1.3.0, it appeared without adding (It is the GittyupQT6 repo i work in atm.)
@probonopd maybe you have an idea why the appimage builder does not find libqxcb.
2024/01/21 11:17:37 Detected Qt 6
2024/01/21 11:17:37 Using $QTDIR: /home/runner/work/Gittyup/Qt/6.5.*/gcc_64
2024/01/21 11:17:37 Looking in /home/runner/work/Gittyup/Qt/6.5.*/gcc_64/plugins
2024/01/21 11:17:37 Could not find 'plugins/platforms/libqxcb.so' in qtPrfxpath, exiting
I printed the paths:
Show QTDIR
bin doc include lib libexec metatypes mkspecs modules phrasebooks plugins qml resources translations
Show QTDIR/plugins
designer egldeviceintegrations generic iconengines imageformats networkinformation platforminputcontexts platforms platformthemes printsupport qmllint qmltooling sqldrivers tls wayland-decoration-client wayland-graphics-integration-client wayland-shell-integration xcbglintegrations
Show QTDIR/plugins/platforms
libqeglfs.so libqlinuxfb.so libqminimal.so libqminimalegl.so libqoffscreen.so libqvkkhrdisplay.so libqvnc.so libqwayland-egl.so libqwayland-generic.so libqxcb.so
Probably I broke MacOs build with 9c349e5dc2e7ce49bce548019987c4a1b36d8f8d..7b1216860ed06926d0b9bbc9e03ed9e6ff730d6e, but first lets fix Appimage then I can revert the changes
@Murmele not really, sorry. Haven't had time to investigate Qt6 yet.
@Murmele not really, sorry. Haven't had time to investigate Qt6 yet.
Ah thanks, then I will check it out and notify you about
@probonopd It seems that it was due to the wildcard in the qt version. Just for your information: https://github.com/Murmele/Gittyup/pull/429/commits/00675a77f7eef715e00c2b5bd6b603a8d9a7eb96
We can check the commit c0754a0e061352c8d8d4434952115796063c9401 from GitAhead where the port happened
Then we need to have a deeper look into it because GitAhead does not have this problem with Qt6
I just tried to find the differences in GitAheads QT6 commit in order to fix our theming problems.
First things first:
Theme problems on MacOS:
- highlighting of selected Repo only slightly visible (sshTools is highlighted)
- This is the same as in the QT5 Gittyup
- Use Ours and Use Theirs button not colored
- This is also the same as in the QT5 Gittyup - @Murmele We should open another issue for this as it is confusing
Theme problems on Linux:
- The theme problems on linux disappered
.git name problem:
@Murmele This has nothing to do with this QT6 migration, we already talked about this somewhere else, am i correct?
I just tried to find the differences in GitAheads QT6 commit in order to fix our theming problems.
First things first:
Theme problems on MacOS:
* highlighting of selected Repo only slightly visible (sshTools is highlighted) * This is the same as in the QT5 Gittyup * Use Ours and Use Theirs button not colored * This is also the same as in the QT5 Gittyup - @Murmele We should open another issue for this as it is confusingTheme problems on Linux:
* The theme problems on linux disappered.git name problem:
@Murmele This has nothing to do with this QT6 migration, we already talked about this somewhere else, am i correct?
You mean https://github.com/Murmele/Gittyup/issues/760?
You mean #760?
Yes, but is there already an issue for the "Use Ours", "Use Theirs" button color problem? This happens in Gittyup 1.4.0 on MacOS for me.
@exactly-one-kas If you have some time can you please check out the Windows theming problem this branch has, i am unable to build openssl on windows..
Currently in Windows it looks like this: