Skip to content

Commit 6301b1b

Browse files
committed
fixup! Separate OBSQTDisplay code into another repository
1 parent ac3eb2a commit 6301b1b

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
3030
find_package(obs-frontend-api REQUIRED)
3131
include(cmake/ObsPluginHelpers.cmake)
3232
add_library(OBS::frontend-api ALIAS OBS::obs-frontend-api)
33-
find_qt(VERSION ${QT_VERSION} COMPONENTS Widgets Core COMPONENTS_LINUX Gui)
33+
find_qt(VERSION ${QT_VERSION} COMPONENTS Widgets Core Gui)
3434
endif()
3535

3636
if(NORISCOMMONUI_SUBMODULE)
@@ -79,7 +79,6 @@ target_link_libraries(${PROJECT_NAME}
7979
Qt::Core
8080
Qt::Widgets
8181
Qt::Gui
82-
Qt::GuiPrivate
8382
noriscommonui::noriscommonui
8483
)
8584

cmake/ObsPluginHelpers.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ macro(find_qt)
101101

102102
list(APPEND _QT_COMPONENTS Core)
103103

104-
if("Gui" IN_LIST FIND_QT_COMPONENTS_LINUX)
105-
list(APPEND _QT_COMPONENTS "GuiPrivate")
106-
endif()
107-
108104
# Check for versionless targets of each requested component and create if necessary
109105
foreach(_COMPONENT IN LISTS _QT_COMPONENTS)
110106
if(NOT TARGET Qt::${_COMPONENT} AND TARGET Qt${_QT_VERSION}::${_COMPONENT})

noriscommonui

0 commit comments

Comments
 (0)