80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4361 from joshuashaffer/master

Browse Source 
For Qt5 add Gui Private Include Header. Fix C++ union initializer syn…
This commit is contained in:
Miran Grča
2024-07-21 23:48:04 +02:00
committed by GitHub
parent 72527a61ee 072a6c5a05
commit acb832d776
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/CMakeLists.txt
View File

@@ -41,8 +41,12 @@ endif()
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL REQUIRED) find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL Gui REQUIRED)
find_package(Qt${QT_MAJOR}LinguistTools REQUIRED NO_CMAKE_FIND_ROOT_PATH) find_package(Qt${QT_MAJOR}LinguistTools REQUIRED NO_CMAKE_FIND_ROOT_PATH)
if(NOT USE_QT6)
# For <qpa/qplatformwindow.h> in src/qt/qt_mainwindow.cpp
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
endif ()
# TODO: Is this the correct way to do this, and is it required on any # TODO: Is this the correct way to do this, and is it required on any
# other platforms or with Qt 5? # other platforms or with Qt 5?

8
src/sound/snd_opl_ymfm.cpp
View File

@@ -425,7 +425,7 @@ const device_t ym3812_ymfm_device = {
.init = ymfm_drv_init, .init = ymfm_drv_init,
.close = ymfm_drv_close, .close = ymfm_drv_close,
.reset = NULL, .reset = NULL,
{ .available = NULL }, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL
@@ -439,7 +439,7 @@ const device_t ymf262_ymfm_device = {
.init = ymfm_drv_init, .init = ymfm_drv_init,
.close = ymfm_drv_close, .close = ymfm_drv_close,
.reset = NULL, .reset = NULL,
{ .available = NULL }, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL
@@ -453,7 +453,7 @@ const device_t ymf289b_ymfm_device = {
.init = ymfm_drv_init, .init = ymfm_drv_init,
.close = ymfm_drv_close, .close = ymfm_drv_close,
.reset = NULL, .reset = NULL,
{ .available = NULL }, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL
@@ -467,7 +467,7 @@ const device_t ymf278b_ymfm_device = {
.init = ymfm_drv_init, .init = ymfm_drv_init,
.close = ymfm_drv_close, .close = ymfm_drv_close,
.reset = NULL, .reset = NULL,
{ .available = NULL }, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL