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

[qt-base] Use opengl dynamic configuration #6503

Merged
merged 7 commits into from
May 22, 2019
Merged

Conversation

andrm
Copy link
Contributor

@andrm andrm commented May 17, 2019

This setting lets Qt use the ANGLE library and makes rendering on DirectX / Direct3D possible. OpenGL backends are switchable at runtime.

@msftclas
Copy link

msftclas commented May 17, 2019

CLA assistant check
All CLA requirements met.

@andrm andrm changed the title Use opengl dynamic configuration [qt-base] Use opengl dynamic configuration May 17, 2019
@vicroms
Copy link
Member

vicroms commented May 17, 2019

Hi @andrm

Thanks for your contribution!

qt5-base fails to build on Linux with the following message:

CMake Error at ports/qt5-base/install_qt.cmake:33 (file):
  file COPY cannot copy file "/usr/bin/flex" to "/usr/bin/bin/flex".
Call Stack (most recent call first):
  ports/qt5-base/portfile.cmake:147 (install_qt)
  scripts/ports.cmake:71 (include)


Error: Building package qt5-base:x64-linux failed with: BUILD_FAILED

You should wrap the relevant code inside an if block like this

if (CMAKE_HOST_WIN32)
   # your code
endif()

ports/qt5-base/install_qt.cmake Outdated Show resolved Hide resolved
ports/qt5-base/portfile.cmake Show resolved Hide resolved
ports/qt5-base/install_qt.cmake Outdated Show resolved Hide resolved
@Neumann-A
Copy link
Contributor

What is Qt default here? I would prefer to use the default and have whatever is not the default be a feature flag.

@andrm
Copy link
Contributor Author

andrm commented May 20, 2019

Thank you very much for the quick responses and critques. I will re-work the PR.
Dynamic is the default in the pre-built packages from qt.io since 5.5. The page at https://doc.qt.io/qt-5/windows-requirements.html says this:
"Note: As of Qt 5.5 this is the configuration used by the official, pre-built binary packages of Qt. It is strongly recommended to use it also in custom builds, especially for Qt binaries that are deployed alongside applications."

@andrm
Copy link
Contributor Author

andrm commented May 20, 2019

You should wrap the relevant code inside an if block like this

if (CMAKE_HOST_WIN32)
   # your code
endif()

Ok, done.

@andrm
Copy link
Contributor Author

andrm commented May 20, 2019

I think I've addressed all issues, can you please re-check the PR?

@vicroms
Copy link
Member

vicroms commented May 22, 2019

Thanks for the PR!
Everything looks OK now.

@vicroms vicroms merged commit 07fd30c into microsoft:master May 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants