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

Revert "qtbase: Fix paths returned by qmake -query" #65446

Merged
merged 1 commit into from Jul 27, 2019

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Jul 26, 2019

Reverts #57097 to fix the qt-full build.

qmake is not expected to work correctly outside of the Nix builder or a qt5.env.

@ttuegel ttuegel self-assigned this Jul 26, 2019
@ttuegel
Copy link
Member Author

ttuegel commented Jul 27, 2019

Check failures are unrelated to these changes (something about Haskell and gdk_pixbuf) so I'm going to merge in spite of them.

@ttuegel ttuegel merged commit 6e2e11a into staging Jul 27, 2019
@vcunat vcunat deleted the revert-57097-qmake-header branch July 30, 2019 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant