Merging the android plugin to Qt Creator

Thu Sep 1 18:24:58 UTC 2011

On Thursday 01 Sep 2011 15:43:05 Teske Daniel (Nokia-MP-Qt/Berlin) wrote:
> > I tried to apply your patches 2.3-stagin but it doesn't compile anymore,
> > should I create another branch and merge master branch of upstream
> > qt-creator ? This mean to create another merge request !
> 
> The patches were on top of a master merge into 2.3-staging.
> So 0002 and 0003 should apply cleanly, whereas you 0001 is only needed if
> you want to merge master into 2.3-staging. That depends on your plans for
> the next sdk release. I'd guess you would probably want to use 2.3 for
> now, which means, you should save 0001 for later.

I did recreate those patches against 2.3-staging and added a few more:
0001 and 0002 are just the rebased patches.

0003:
I did a first pass over the android plugin code and fixed all coding style 
errors I found. Please check this patch carefully, I'm pretty sure that with 
the amount of small changes, I might have made a conversion error somewhere.
The major ones were:
- put a space after "if", "while", "for" and others.
- put spaces around operators like "+", "-", "+="
- put a space after "," and ";" in the for loop
- use isEmpty() instead if size() or lenght() (for no particular reason 
actually)
- "Type &variable" is our prefered way
- braces (except for classes and functions) don't have a line for themselves
- the branches in if/else, either both or none should have braces
Various small things
I also probably missed quite a few cases, but that's a start. :)

0004:
For some reason, without that patch the branch doesn't compile for me

0005:
QLatin1String is essentially just a const char *, thus passing a reference to 
it, is the same as passing a reference to a pointer, that's not faster then 
passing the pointer directly.

0006:
I think the QProcess is leaked if the process could not be started for any 
reason, since in that case no finished signal is emitted.

0007:
The using isEnabled() function was to work around that virtual functions get 
hidden if they are overloaded in a derived class with a different parameter 
list. I removed that problem before 2.3, there's now no overloading anymore, 
thus the using line is simply no longer needed

0008:
The cast is not needed if we pass on the right type

0009:
The class doesn't exist anymore in that namespace, and indeed it wasn't used 
anymore

0010:
The code looked wrong, though I'm not sure whether that fix is the correct one. 
I haven't actually tested it.

0011:
The top level qtcreator.pro checks whether qt is at least 4.7.4, thus the code 
can be savely removed

0012:
We don't use abbreviations in our names, thus "Dont" isn't allowed, also 
NoMatch seems to be a better fit. The other changes should be pretty clear.

daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Remove-no-longer-used-ressource.h.patch
Type: text/x-patch
Size: 977 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0012.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Code-stylistics-to-RemoteGdbServerAdapter-changes.patch
Type: text/x-patch
Size: 1515 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0013.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-QProcess-finished-is-not-emitted-if-the-process-coul.patch
Type: text/x-patch
Size: 1205 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0014.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-Compile-fix.patch
Type: text/x-patch
Size: 883 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0015.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-QLatin1String-QLatin1String.patch
Type: text/x-patch
Size: 2277 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0016.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Coding-style-changes.patch
Type: text/x-patch
Size: 130901 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0017.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-Remove-unneeded-qboject_cast.patch
Type: text/x-patch
Size: 2766 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0018.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-Remove-using-line-that-s-not-needed.patch
Type: text/x-patch
Size: 981 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0019.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0011-Remove-old-code-for-qt-4.7.1.patch
Type: text/x-patch
Size: 1131 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0020.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-Remove-unused-forward-declaration.patch
Type: text/x-patch
Size: 830 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0021.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0010-Actually-call-checkPid-while-waiting-in-AndroidRunne.patch
Type: text/x-patch
Size: 1676 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0022.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0012-Fix-typos-and-rename-DontMatch-to-NoMatch.patch
Type: text/x-patch
Size: 4430 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110901/d4ab266c/attachment-0023.patch>