Commit Graph

20 Commits

Author SHA1 Message Date
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Daniel Teske
17c04dccc0 Android: Compare typeId() to the correct constant
Broken in e6d1141e1e,
which changed the code to use typeId() instead of type() but
didn't change to what it was compared.

Change-Id: I5b4f76395bd193ee30ee606023483d3bd0b062e8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-15 15:55:22 +00:00
Tobias Hunger
e6d1141e1e ToolChain: Get rid of type() in favor of typeId()
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:40:03 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Tobias Hunger
d7674e45c2 KitInformation: Delete subwidgets in destructor
Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 10:13:26 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 18:46:20 +02:00
Tobias Hunger
a82654a485 Android: Remove some Android namespace usages
Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-03 16:18:26 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:18:29 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:45:25 +02:00
hjk
c10ae974eb KitInformation: Make dataId and priority value members
More in line with recent development.

Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:26:02 +02:00
BogDan Vatra
24b14fa2b4 Export android specific settings to QBS
Change-Id: I3640272dc027047a1d27a2b55329c9f5093e8f1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 15:29:05 +02:00
Tobias Hunger
4e3c7b9835 Kit: Provide interface to mark individual kit information sticky
Change-Id: Ic45aae21cb8b0f4e4fdd0dcf1009f127e489920c
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:15:16 +02:00
Tobias Hunger
1ca9bab242 Kit: Only make SDK-set KitInformation read-only
Leave the rest user-editable.

Task-number: QTCREATORBUG-9030
Change-Id: I77c9ff980dd9a497bff53ee04dae7e771e4e7e82
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-07 16:39:29 +02:00
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