[KDE/Mac] Trouble applying QSP patch from Qt's codereview

[Ben Cooksley]

On Tue, Mar 3, 2015 at 8:39 PM, Marko Käning <mk-lists at email.de> wrote:
> Hi Ben,

Hi Marko,

>
> do you have any idea on how to create a QSP patch for the CI-cloned qt5 sources
> which are based on 5.4.1 these days?
>
> Please see my initial post [1] on this thread for more details on what trouble
> I met here on OSX/CI.
>
> Why is there a qstandardpaths_mac.mm for Jeremy, while I get from your python CI
> scripts qstandardpaths_mac.cpp?
>
> Jeremy’s patch is based on 5.4.0 and I cannot figure out how to rebase his
> changes from Qt’s Gerrit ticket for QSP [2] onto the 5.4.1 from KDE/CI.

Please check the branch that is being checked out in qt5.git to make
sure the scripts are indeed grabbing 5.4.1.
Otherwise, i'd suggest wiping the whole qt5.git clone and starting
from scratch to eliminate any problems with submodules.

>
> Greets,
> Marko

Cheers,
Ben

>
>
>
> [1] https://mail.kde.org/pipermail/kde-mac/2015-February/003438.html
> [2] https://codereview.qt-project.org/#/c/103277/