In wireless communication, is pulse shaping applied to each BPSK signal before OFDM is used, or not?

I have read a number of posts that seem to ask this question but have not been able to find a definitive answer. Here goes…

I understand that BPSK with NO pulse shaping would produce a signal in the time domain something like this:

But, for wireless communication, this takes up a lot of bandwidth. Therefore the data is sampled to create a series of discrete pulses which are then used to create a 2 PAM signal (i.e. pulse shaping is applied). The 2 PAM signal is then used to modulate a continuous carrier wave. The transmitted signal therefore looks something like this (the envelope in green is the 2 PAM signal):

I understand that multipath effects are problematic because the receiver can have trouble distinguishing a signal from its reflections. Slowing down the symbol rate helps, and therefore, so does OFDM.

When OFDM is used with BPSK, a stream of data is split into multiple parallel streams. Each stream is BPSK modulated using a carrier wave of a slightly different frequency to the others (these are carefully calculated to ensure they are orthogonal to each other). These modulated signals are then added together and transmitted as one radio signal. Because the carriers are orthogonal, the receiver can separate the individual BPSK signals and recover the data.

Here’s my question. When it comes to wireless data transmission, are unshaped BPSK signals multiplexed using OFDM (first image), or are pulse shaped BPSK signals multiplexed using OFDM (second image).
Indeed, when OFDM is used in conjunction with QPSK or QAM, are the QPSK or QAM signals pulse shaped before being multiplexed, or not?