Am Donnerstag, 28. Mai 2015, 21:00:17 schrieb Boudewijn Rempt:
> On Thu, 28 May 2015, Friedrich W. H. Kossebau wrote:
> > Hi Treeve,
> >
> > thanks for reporting the error and working on a patch :)
> >
> > Am Donnerstag, 28. Mai 2015, 13:31:29 schrieb Treeve Jelbert:
> >> thanks, the following diff fixes it
> >>
> >> diff --git a/devtools/rng2cpp/rng2cpp.cpp
> >> b/devtools/rng2cpp/rng2cpp.cpp
> >> index 3dc3214..de65ac4 100644
> >> --- a/devtools/rng2cpp/rng2cpp.cpp
> >> +++ b/devtools/rng2cpp/rng2cpp.cpp
> >> @@ -23,12 +23,10 @@
> >>
> >> #include <QtGlobal>
> >> #include <QSharedPointer>
> >> #include <QStringList>
> >>
> >> +#include <QSet>
> >> +#include <QVector>
> >
> > Aha, this is why there was an offset of +2 in the build log you posted :)
> > But, why did you add those two lines? Are they left overs from some
> > experiment, or do you think they are needed to fix this build problem you
> > reported?
>
> I think the extra includes might be what does the trick: the Qt people
> removed some transitive #includes in the latest Qt5, blithely disregarding
> that that'd break code all over the world.
Those two extra includes possibly already were part when the build failed for
Treeve, see e.g.
/var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:313:4:
error: expected primary-express
ion before 'do'
assert(a->allowedItems.contains(b), "");
^
while that is line 311 with current frameworks branch (and calligra/2.9, the
file is untouched for 2 years now :) ).
So for now still curious what really broke here and what is the actual fix.
Cheers
Friedrich
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
