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

OverlayConfig: handle removal of qWinAppInst() in Qt 5.8. #2857

Merged
merged 1 commit into from Feb 20, 2017

Conversation

@mkrautz
Copy link
Member

commented Feb 19, 2017

This commit fixes the OverlayConfig code to build on Qt 5.8,
where qWinAppInst() was removed.

It was removed via
qt/qtbase@64507c7

Thankfully, qWinAppInst() was very simple: it just called through
to GetModuleHandle(0) -- in both Qt 4, and Qt 5.

To sidestep the removal of qWinAppInst(), we fix our code by calling
GetModuleHandle() directly. (With 0 changed to NULL, which is what
we usually do in our coding style.)

OverlayConfig: handle removal of qWinAppInst() in Qt 5.8.
This commit fixes the OverlayConfig code to build on Qt 5.8,
where qWinAppInst() was removed.

It was removed via
qt/qtbase@64507c7

Thankfully, qWinAppInst() was very simple: it just called through
to GetModuleHandle(0) -- in both Qt 4, and Qt 5.

To sidestep the removal of qWinAppInst(), we fix our code by calling
GetModuleHandle() directly. (With 0 changed to NULL, which is what
we usually do in our coding style.)

@mkrautz mkrautz force-pushed the mkrautz:remove-qwinappinst branch from ec9daf8 to 1a4ecd1 Feb 19, 2017

@davidebeatrici davidebeatrici merged commit a978593 into mumble-voip:master Feb 20, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.