> On Aug. 23, 2016, 1:27 nachm., Heiko Becker wrote: > > ?[12:11] ?<?sandsmark?>? commit it if someone can test with the appropriate > > Qt versions > > ... > > ?[12:13] ?<?veqz?>? hmm, I have the right Qt versions. I can download the > > pat- > > ... > > ?[12:31] ?<?veqz?>? heirecka: I ended up applying to patch manually..., and > > it compiles fine now :) > > Burkhard Lück wrote: > Your patch breaks build with Qt 5.6.1 for me > > I need this patch on to of yours to get it build: > index 4607966..abc50af 100644 > --- a/src/core/guesslanguage.cpp > +++ b/src/core/guesslanguage.cpp > @@ -489,7 +489,7 @@ GuessLanguagePrivate::GuessLanguagePrivate() > case QChar::Script_WarangCiti: > names = getNames(QLocale::VarangKshitiScript); > break; > -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) > +#if QT_VERSION > QT_VERSION_CHECK(5, 6, 1) > case QChar::Script_Ahom: > names = getNames(QLocale::AhomScript); > break;
Yeah, sorry about that. I misread git's output, when determining in which qt version it had landed. Fixed with: https://quickgit.kde.org/?p=sonnet.git&a=commit&h=3d7d09fb7bae81ab5d277c1862b85955df96f1f5 - Heiko ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128739/#review98566 ----------------------------------------------------------- On Aug. 23, 2016, 1:28 nachm., Heiko Becker wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/128739/ > ----------------------------------------------------------- > > (Updated Aug. 23, 2016, 1:28 nachm.) > > > Review request for KDE Frameworks and Martin Tobias Holmedahl Sandsmark. > > > Repository: sonnet > > > Description > ------- > > Also correct the other #ifdef because like QChar::Script_SignWriting > 0e1f3aab11a4310595d8651c02ce5f9d60c93252 in qtbase.git introduced the > other enums as well. That commit was first released with Qt 5.6 > > BUG: 366789 > CCMAIL: martin.sandsm...@kde.org > > > Diffs > ----- > > src/core/guesslanguage.cpp 5c5239fbe99c9a3ea95bd07dc4d0ec6582897379 > > Diff: https://git.reviewboard.kde.org/r/128739/diff/ > > > Testing > ------- > > Haven't an old Qt around, tested building with 5.7. though. > > > Thanks, > > Heiko Becker > >