diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index df3c44e34d..9683626f3d 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -156,7 +156,7 @@ disable_compiler_warnings_for_target(cubeb) disable_compiler_warnings_for_target(speex) # Find the Qt components that we need. -find_package(Qt6 6.6.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED) +find_package(Qt6 6.6.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) if(WIN32) add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL) diff --git a/common/vsprops/QtCompile.props b/common/vsprops/QtCompile.props index ff2e4b63eb..a9e9021756 100644 --- a/common/vsprops/QtCompile.props +++ b/common/vsprops/QtCompile.props @@ -32,7 +32,7 @@ $(QtLibDir);%(AdditionalLibraryDirectories) - Qt6Core$(QtLibSuffix).lib;Qt6Gui$(QtLibSuffix).lib;Qt6Widgets$(QtLibSuffix).lib;Qt6Network$(QtLibSuffix).lib;Qt6Concurrent$(QtLibSuffix).lib;%(AdditionalDependencies) + Qt6Core$(QtLibSuffix).lib;Qt6Gui$(QtLibSuffix).lib;Qt6Widgets$(QtLibSuffix).lib;Qt6Concurrent$(QtLibSuffix).lib;%(AdditionalDependencies) @@ -118,24 +118,21 @@ - + - - - $(QtBinaryOutputDir)qt.conf + Inputs="@(QtDlls);@(QtPlugins)" + Outputs="@(QtDlls -> '$(QtBinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPluginsDest)"> -