Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5507-g2f31c00 android-qt-creator/src/plugins/ (3 files in 2 dirs): (link)

Revert the changes made to buildstep.cpp

Adapt android plugin to new changes.

Change-Id: Ibaf41134459444bd2eb23a1cecb2c4aed7a5d1cc

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5506-ge9b55be android-qt-creator/: (link)

Merge remote-tracking branch 'upstream/heads/2.5' into 2.5

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5476-g97e5371 android-qt-creator/src/plugins/debugger/gdb/gdbengine.cpp: (link)

Fix set breakpoint on Android.

Change-Id: I99a7025d47efe551718044aece1f65152d28e308

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5547-gcc968de android-qt-creator/src/plugins/debugger/gdb/gdbengine.cpp: (link)

Fix set breakpoint on Android.

Change-Id: I8512c407a5168786593d1767793ab75bdf7667c8

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5475-gc2a7303 android-qt-creator/ (78 files in 12 dirs): (link)

Android plugin

Change-Id: I303df29957abc47759076cb70fb8e6b0f08b2b37

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5352-g645948e android-qt-creator/src/plugins/android/ (4 files): (link)

Fix crash

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5422-g0011fd1 android-qt-creator/src/plugins/android/ (7 files): (link)

Fix compilation/crash

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5351-gef9e3cc android-qt-creator/src/plugins/ (11 files in 2 dirs): (link)

Fix compilation

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5421-gbf3d809 android-qt-creator/src/plugins/ (11 files in 2 dirs): (link)

Fix compilation

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5350-g0cb5a4b android-qt-creator/src/plugins/android/ (2 files): (link)

Sync package signing with android changes.

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5420-gb9ac08f android-qt-creator/src/plugins/android/ (2 files): (link)

Sync package signing with android changes.

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5349-g26bcd8d android-qt-creator/src/plugins/android/androidtarget.cpp: (link)

Don't warm the user when android files are created (not updated).

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5419-g8304f1c android-qt-creator/src/plugins/android/androidtarget.cpp: (link)

Don't warm the user when android files are created (not updated).

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5348-g263bb72 android-qt-creator/src/plugins/android/ (androidtarget.cpp androidtarget.h): (link)

Update android files when needed

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5418-g1ccc4ce android-qt-creator/src/plugins/android/ (androidtarget.cpp androidtarget.h): (link)

Update android files when needed

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5345-g170ceb8 android-qt-creator/ (78 files in 12 dirs): (link)

Android plugin

Change-Id: If939ff104209ca63bf1cb03dca886e9e020d1aaa

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5347-g8cc42c7 android-qt-creator/share/qtcreator/templates/shared/deployment.pri: (link)

Fix delpoy assets on windows

Fix: http://sourceforge.net/p/necessitas/tickets/124/
https://code.google.com/p/android-lighthouse/issues/detail?id=88

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5417-g5e1c57e android-qt-creator/share/qtcreator/templates/shared/deployment.pri: (link)

Fix delpoy assets on windows

Fix: http://sourceforge.net/p/necessitas/tickets/124/
https://code.google.com/p/android-lighthouse/issues/detail?id=88

Commit by BogDan Vatra on 2.5 :: rv2.2.0-beta-5346-gd98d2cd android-qt-creator/src/plugins/android/ (2 files): (link)

Set also the package and application name when the package is created

Commit by BogDan Vatra on gerrit :: rv2.2.0-beta-5416-g96e25f6 android-qt-creator/src/plugins/android/ (2 files): (link)

Set also the package and application name when the package is created