migrated to qt6 #429

wolfseifert · 2023-01-17T15:31:59Z

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).

src/dialogs/CMakeLists.txt

Murmele · 2023-01-17T15:49:49Z

CMakeLists.txt

+  Qt6
  COMPONENTS ${QT_MODULES} LinguistTools
  REQUIRED)
 if(FLATPAK)
  find_package(
-    Qt5 5.15
+    Qt6


we have to find a way to support both

Do we? What platforms/targets don't have Qt6 on the menu already and/or won't soon? It seems to be a project like this would benefit from staying on top of the toolkit/library game and any effort back-porting to older versions should be on an as-demanded basis and provided by the people that really want to see it happen for whatever reason. The main development effort should be on the latest stable releases when possible and this seems like a great opportunity to hit that target.

Supporting both would mean lots of #ifdefs, a nightmare...

I rebased the branch, maybe we can go just with Qt6

@exactly-one-kas do you have anything against it?

Murmele · 2023-10-08T07:32:53Z

src/app/Gittyup.cpp

@@ -13,8 +13,6 @@
 #include <QMessageBox>

 int main(int argc, char *argv[]) {
-  Application::setAttribute(Qt::AA_EnableHighDpiScaling);
-  Application::setAttribute(Qt::AA_UseHighDpiPixmaps);
  Application app(argc, argv, true);


Why is this anymore required?

Murmele · 2023-10-08T07:37:16Z

src/dialogs/ConfigDialog.cpp

@@ -505,7 +506,7 @@ class LfsPanel : public QWidget {
              watcher->deleteLater();
            });

-    watcher->setFuture(QtConcurrent::run(repo, &git::Repository::lfsTracked));


I understand why you changed it, but I don't understand why it worked also the other way?

Ok it does not compile the other way around, but the function definition looks same in Qt5 and Qt6

Murmele · 2023-10-08T07:38:58Z

src/dialogs/DeleteBranchDialog.cpp

@@ -61,8 +61,9 @@ DeleteBranchDialog::DeleteBranchDialog(const git::Branch &branch,

      entry->setBusy(true);
      QStringList refspecs(QString(":%1").arg(upstreamName));
+      git::Result (git::Remote::*push)(git::Remote::Callbacks*, const QStringList&) = &git::Remote::push;


what is the benefit of this function pointer?

Murmele · 2023-10-08T08:49:51Z

@exactly-one-kas do you think we still need win32?

Murmele · 2023-10-08T09:19:25Z

@exactly-one-kas Can you test and build this branch on Arch Linux?

Murmele · 2023-10-27T16:17:25Z

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);

Murmele · 2024-01-21T11:21:51Z

@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

Murmele · 2024-01-21T11:24:33Z

Probably I broke MacOs build with 9c349e5..7b12168, but first lets fix Appimage then I can revert the changes

probonopd · 2024-01-21T12:23:43Z

@Murmele not really, sorry. Haven't had time to investigate Qt6 yet.

Murmele · 2024-01-21T12:35:45Z

@Murmele not really, sorry. Haven't had time to investigate Qt6 yet.

Ah thanks, then I will check it out and notify you about

.github/workflows/build.yml

Murmele · 2024-02-06T09:17:04Z

@probonopd It seems that it was due to the wildcard in the qt version. Just for your information: 00675a7

Murmele · 2024-02-26T13:24:20Z

We can check the commit c0754a0e061352c8d8d4434952115796063c9401 from GitAhead where the port happened

Murmele · 2024-05-22T09:56:11Z

.github/workflows/build.yml

-
-          - version: 5.12.0
-            check_only: true
+          - version: 6.5.3


updating? Maybe it fixes the theme issues?

I can try it when i have some time this or next week, but i don't think it will fix our problems here, it must have something to do with the custom theme Gittyup has because default ways of theming work in every qt6 version i tried.

Murmele · 2024-05-22T16:40:04Z

Then we need to have a deeper look into it because GitAhead does not have this problem with Qt6

- cleanup - Fix usage of deprecated functions

0verEngineer · 2024-06-14T13:24:37Z

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?

Murmele · 2024-06-15T07:39:10Z

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?

You mean #760?

This reverts commit 918df65.

0verEngineer · 2024-06-15T11:54:06Z

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.

0verEngineer · 2024-06-15T12:31:27Z

@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..

Murmele · 2024-06-17T09:47:12Z

Currently in Windows it looks like this:

Murmele reviewed Jan 17, 2023

View reviewed changes

exactly-one-kas added the enhancement New feature or request label Jan 27, 2023

wolfseifert and others added 3 commits October 8, 2023 09:28

Reason:

2b558bd

format

feadf99

fix

ad2a208

Murmele force-pushed the patch-gittyup-qt6 branch from e6d816f to ad2a208 Compare October 8, 2023 07:45

update openssl version to 3.0

7e2fec7

Murmele requested changes Oct 8, 2023

View reviewed changes

Murmele added 5 commits October 8, 2023 10:06

fix compilation

2b2f5cd

fix compilation

ca253a8

update github build file to support Qt6

c8df519

Reason:

3986e2a

update action

7bf3f9a

Murmele added 2 commits October 8, 2023 11:10

try to remove xcbqpa

318760f

use temporarly different branch from flathub with Qt6 upgrade

39e0348

Murmele added 2 commits October 8, 2023 12:30

Wrong weekday in unittests

93e49b3

remove Win32 support because Qt6 does not support it anymore

e468b2b

Murmele mentioned this pull request Oct 8, 2023

UI error (Build version) #642

Closed

add includes

f9ea366

This was referenced Oct 27, 2023

runtime org.kde.Platform branch 5.15-21.08 is end-of-life #644

Open

Adds macOS theme switch listening #430

Draft

Murmele added 3 commits October 31, 2023 20:18

try to fix compilation error on windows

7afb87c

try to fix compilation on mac

b08b683

fix compilation on win

706f288

Murmele force-pushed the patch-gittyup-qt6 branch from 13cb439 to 706f288 Compare November 1, 2023 17:24

Murmele added 2 commits November 1, 2023 18:25

fix ninja check for windows

e99a59f

use always windows

57cf7c9

Disable using qt_import_plugins for UNIX again

7b12168

Murmele reviewed Feb 6, 2024

View reviewed changes

.github/workflows/build.yml Outdated Show resolved Hide resolved

Try to change qt version without wildcard

00675a7

Murmele mentioned this pull request Feb 26, 2024

Lack of linux prebuilt binaries on Linux gitahead/gitahead#645

Open

Murmele mentioned this pull request Mar 11, 2024

flatpak issue with org.freedesktop.Sdk//21.08 being end-of-life #712

Open

Murmele marked this pull request as draft April 20, 2024 14:25

Murmele reviewed May 22, 2024

View reviewed changes

- Use qt 6.7.1 to build the project

37cf410

- cleanup - Fix usage of deprecated functions

Murmele and others added 7 commits June 14, 2024 15:28

Merge branch 'master' into patch-gittyup-qt6

79592fa

Fix formatting

c63b67d

Update insall-qt-action for the github workflows

57c84d7

Downgrade qt again because aqt-install is broken with qt 6.7.x

51e22ce

Downgrade install-qt-action to match qt version

fb83908

qt downgrade

5fb5d66

fix flatpak manifest qt version

3803be2

Murmele added 3 commits June 15, 2024 10:12

add missing Q_OBJECT

6bbcfdd

Add missing Q_OBJECT

918df65

Revert "Add missing Q_OBJECT"

c33a6c2

This reverts commit 918df65.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

migrated to qt6 #429

migrated to qt6 #429

wolfseifert commented Jan 17, 2023

Murmele Jan 17, 2023

alerque Jan 17, 2023

wolfseifert Jan 17, 2023

Murmele Oct 8, 2023

Murmele Oct 8, 2023

Murmele Oct 8, 2023

Murmele Oct 8, 2023

Murmele Oct 8, 2023

Murmele Oct 8, 2023

Murmele commented Oct 8, 2023

Murmele commented Oct 8, 2023

Murmele commented Oct 27, 2023

Murmele commented Jan 21, 2024 •

edited

Loading

Murmele commented Jan 21, 2024

probonopd commented Jan 21, 2024

Murmele commented Jan 21, 2024

Murmele commented Feb 6, 2024

Murmele commented Feb 26, 2024 •

edited

Loading

Murmele May 22, 2024

0verEngineer May 22, 2024

Murmele commented May 22, 2024

0verEngineer commented Jun 14, 2024 •

edited

Loading

Murmele commented Jun 15, 2024

Theme problems on MacOS:

Theme problems on Linux:

.git name problem:

0verEngineer commented Jun 15, 2024

0verEngineer commented Jun 15, 2024

Murmele commented Jun 17, 2024

migrated to qt6 #429

Are you sure you want to change the base?

migrated to qt6 #429

Conversation

wolfseifert commented Jan 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Murmele commented Oct 8, 2023

Murmele commented Oct 8, 2023

Murmele commented Oct 27, 2023

Murmele commented Jan 21, 2024 • edited Loading

Show QTDIR

Show QTDIR/plugins

Show QTDIR/plugins/platforms

Murmele commented Jan 21, 2024

probonopd commented Jan 21, 2024

Murmele commented Jan 21, 2024

Murmele commented Feb 6, 2024

Murmele commented Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Murmele commented May 22, 2024

0verEngineer commented Jun 14, 2024 • edited Loading

Theme problems on MacOS:

Theme problems on Linux:

.git name problem:

Murmele commented Jun 15, 2024

Theme problems on MacOS:

Theme problems on Linux:

.git name problem:

0verEngineer commented Jun 15, 2024

0verEngineer commented Jun 15, 2024

Murmele commented Jun 17, 2024

Murmele commented Jan 21, 2024 •

edited

Loading

Murmele commented Feb 26, 2024 •

edited

Loading

0verEngineer commented Jun 14, 2024 •

edited

Loading