<br><br><div class="gmail_quote">On Tue, Jul 30, 2013 at 4:20 AM, Sven Langkamp <span dir="ltr"><<a href="mailto:sven.langkamp@gmail.com" target="_blank">sven.langkamp@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><br><div class="gmail_extra"><div class="gmail_quote"><div class="im"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
* we keep a qt5 branch and regularly merge master to the qt5 branch. Big refactorings (komvc, build system changes) should only happen in the Qt5 branch. New features and bug fixes and gsoc results can be merged to master.<br>
</blockquote><div><br></div></div><div>I prefer the second one. That what be less a surprise for everyone running master. To avoid much merge work we could put that in feature freeze for bigger features and at some point merge the qt5 branch back.</div>
</div></div></div></blockquote><div><br>Yes, this is a good idea. We would still be able to release bugfixes for Qt4 version this way.<br></div></div><br><br clear="all"><br>-- <br>Dmitry Kazakov