Skip to content

Q
qgroundcontrol
Unverified Commit 27ec1962 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8318 from andrewvoznytsa/pr-windows-build-fix 

Windows build fix
parents ef536df8 168b8a59
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
qmlglsink.cmake
View file @ 27ec1962
...@@ -41,7 +41,7 @@ elseif(APPLE) ...@@ -41,7 +41,7 @@ elseif(APPLE)
elseif(IOS) elseif(IOS)
target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_MAC) target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_MAC)
elseif(WIN32) elseif(WIN32)
target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_WIN32) target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_WIN32 HAVE_QT_QPA_HEADER)
# TODO: use FindOpenGL? # TODO: use FindOpenGL?
target_link_libraries(gst_plugins_good PUBLIC opengl32.lib user32.lib) target_link_libraries(gst_plugins_good PUBLIC opengl32.lib user32.lib)
......
qmlglsink.pri
View file @ 27ec1962
...@@ -8,7 +8,7 @@ LinuxBuild { ...@@ -8,7 +8,7 @@ LinuxBuild {
} else:iOSBuild { } else:iOSBuild {
DEFINES += HAVE_QT_IOS DEFINES += HAVE_QT_IOS
} else:WindowsBuild { } else:WindowsBuild {
DEFINES += HAVE_QT_WIN32 DEFINES += HAVE_QT_WIN32 HAVE_QT_QPA_HEADER
LIBS += opengl32.lib user32.lib LIBS += opengl32.lib user32.lib
} else:AndroidBuild { } else:AndroidBuild {
DEFINES += HAVE_QT_ANDROID DEFINES += HAVE_QT_ANDROID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment