Commit Graph

5 Commits

Author SHA1 Message Date
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
2013-02-18 14:16:53 +01:00
Daniel Teske
8d15776839 AndroidGdbServerKitInformation: Don't crash without a toolchain
Change-Id: I9d74c0725cb7c4e7cd205b931040479dae494164
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 17:32:48 +01:00
Leena Miettinen
643263ff26 UI text: fix Android strings
Fix capitalization in messages and UI text.

Change-Id: I09fd826566f756cf2afaa4e29f93572089b9a8aa
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-13 12:17:12 +01:00
Daniel Teske
af820b73c7 DebuggerKitInformation: Use Eliding Label
The path to the debugger and gsbserver can get long. This prevents
scrollbars in those cases.

Change-Id: Ic8c22d764ce9d5d798ea3c8d2a9f638d51a30351
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 11:46:09 +01:00
Daniel Teske
4a890f6d47 Simplify Android settings, move debugger/gdbserver to Kit
Creator now realiable creates one toolchain for each toolchain found in
the ndk. This no longer depends on any qt versions being present.

Also the gdb command and gdb server command are moved to the Kit and are
no longer found in the Android Options page. Both settings can be
autodetected from the Kit options page. Note that this might break
existing android kits.

Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-07 19:21:20 +01:00