Let be a claw-free graph of order , where is a positive integer. In this paper, it is proved that if the degree sum is at least for every pair of nonadjacent vertices , then has a spanning subgraph consisting of quadrilaterals and a 4-path such that all of them are vertex-disjoint, unless is isomorphic to , or , where . We further showed that the requirement about claw-free is indispensable and the degree condition is sharp.