On 12/27/2013 01:00 AM, Michael Karcher wrote: > As your patch is already in, I suggest proceeding this way: > 1) Commit a second patch that removes "QtCore" from the include > directives (and does *just* that) > 2) Commit one patch that rephrases the test for autodetectability and > removes the bad "toLatin1" as "minor fixes" patch. I think the ideal > thing from a traceability perspective (who did what when and why) would > be to have this two patches, as these are two logical changes, caused by > different reasons, and even two different severities (one is a code > "clean-up" without functional change, the other one is a bug fix), but I > understand worries about "commit bloat" for small changes, too. So do it > either way you want, or drop the "cleanup" completely, if you decide you > want to keep the "+=" construct with the casts to bool. Note that we can also drop the commits back to 0.9.10 altogether. Thomas can just rework his patches and I create a new history in the git repository. Once the patches are clean, I'll commit them and fix the history. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaubitz@debian.org `. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913