Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow the Qt version to be chosen explicitly #1310

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Conversation

argilo
Copy link
Member

@argilo argilo commented Oct 9, 2023

Gentoo has requested that it be possible to choose Qt6 or Qt5 explicitly. Here I've added cmake options (-DFORCE_QT6=ON, -DFORCE_QT5=ON) to do this. If neither is specified, then the newest available version of Qt will be selected.

/cc @ZeroChaos-

@argilo argilo added the feature label Oct 9, 2023
@ZeroChaos-
Copy link
Contributor

the code seems to work perfectly. I tested setting the flags individually (expected results), setting no flags (default automagic behavior), and setting both (forces qt6).

This all works for me, thanks so much for poking me to update, and then adding my request so quickly!

@argilo argilo merged commit 92e4257 into master Oct 10, 2023
20 checks passed
@argilo argilo deleted the force-qt-version branch October 10, 2023 00:45
@argilo
Copy link
Member Author

argilo commented Oct 10, 2023

FYI @martymac

I hope this will make this patch unnecessary: https://cgit.freebsd.org/ports/tree/comms/gqrx/files/patch-CMakeLists.txt

@martymac
Copy link
Contributor

Thanks @argilo! I've just updated the FreeBSD port. It is now built against Qt6 as everything seems to work fine with it by now!

@argilo
Copy link
Member Author

argilo commented Oct 10, 2023

@martymac I'm glad to hear that. If any other problems come up on FreeBSD, feel free to open a GitHub issue.

@martymac
Copy link
Contributor

@argilo Thanks!

@argilo
Copy link
Member Author

argilo commented Oct 12, 2023

One small fix: 5de29c1

I forgot to change QUIET to REQUIRED in the FORCE_QT6 case, so CMake does not fail immediately if Qt6 is missing. It does fail later on, although not with a user-friendly error message.

This doesn't seem important enough to cut a new release, so it can wait until the next scheduled release.

@kgarrels
Copy link

The QT5 QT6 chooser also works very nicely on my setup:

  • macos 12.7
  • gnuradio from conda
  • QT and all the rest from macports.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants