Merge commit

Fix NPEs caused by logging null exception

fix bug 11186

For PlatSim Stop Mode launch shortcut, skip the first selection page when only one wizard is available.

Merge commit

For PlatSim Stop Mode launch shortcut, skip the first selection page when only one wizard is available.

fix 11186

minor edits to remove platsim reference

Use 3.6 launch configuration APIs

glitch on bug 11131. check the new qmake location to avoid adding duplicate Qt SDKs at IDE start-up

glitch on bug 11131. check the new qmake location to avoid adding duplicate Qt SDKs at IDE start-up

fix bug 11131

merge commit

minor tweaks for bug 11131 after code review

Fix bug 11131

Updated SBSv2Utils#enableSBSv1Support().

Fix for Bug 11073 (Remove SBSv1 as a builder option).

Fix for Bug 11073 (Remove SBSv1 as a builder option).

minor edits to new conn wizard page

Merge PNP launch wizard changes from 2.6

PNP launch wizard changes: make Remote Program text entry into combo viewer with history

Final Debug Process dialog changes from code review

Launch wizard: sync project and remote paths but don't thwart actually editing the path; be looser finding a project file matching the user-edited entry

Fix more bugs with host paths appearing in the remote path dropdown; handle MRU behavior correctly when typing

Add tooltips to Debug Process dialog

Merge commit

Fix remote program selector changes: was not properly initializing from project EXE, and MRU logic was not correct.

PNP launch wizard changes: make Remote Program text entry into combo viewer with history

update run.jstack.bat to 2.6

Fix connection selector defaults

Fix NPE

Fix NPE and default connection selector case

fix bug 11170. Don't add pkg to sis builder for WINSCW

fix bug 11170. Don't add pkg to sis builder for WINSCW.

fix bug 11077 and bug 11033

merge commit

fix a sbsv2 config sorting problem

patch for bug 11077 and bug 11033

David's commit: the connections view was not listening to the changes in connection status, so unless a service changed status, the change in connection status didn?t get updated

PlatSim-related launch wizard changes: (1) Remember last connection created and offer this by default in the Select Connection dialog; (2) Immediately open New Connection dialog if debugging and no connections exist; (3) Split out SelectConnectionDialog; (4) Fix some wording in Select Connection dialog since this is not always an error situation.

Fix ConcurrentModificationException when accumulating service testers

David's commit: the connections view was not listening to the changes in connection status, so unless a service changed status, the change in connection status didn?t get updated

PlatSim-related launch wizard changes: (1) Remember last connection created and offer this by default in the Select Connection dialog; (2) Immediately open New Connection dialog if debugging and no connections exist; (3) Split out SelectConnectionDialog; (4) Fix some wording in Select Connection dialog since this is not always an error situation.

Fix ConcurrentModificationException when accumulating service testers

Merge PlatSim changes from 2.x, but move ILaunchDelegateConnectionExtension into com.nokia.cdt.debug.common so EDC can use it

support for connection status for static connections

support for connection status for static connections

Fix for Bug 10757 (Build is not started when "Use default incremental builder" option is set in preferences).

Fix for Bug 10757 (Build is not started when "Use default incremental builder" option is set in preferences).

Merge commit

Initial pass getting PlatSim connections to work in App/Sys TRK configurations. Add extension for TRK launch delegate for PlatSim-specific behavior.

update sedona templates as part of bug 11049

merge commit

fix bug 11049. use mifconv prj_extension for SBSv2 GUI projects

merge commit

For SBSv2 projects, add SBSV2 macro during bld.inf proprocessing and to build configuration macro cache.

merged changes from 2.6 to 3.0

revised help ID references for project properties dialog

fix name in com.nokia.carbide.cpp.src-feature/.project

revised bugs fixed

BUG 11117 - fixed link to resume debugger page

BUG 11114 - PnP broken link fixed

remove dead code

remove dead code

Fix bug 11022. Get rid of dependency on SBS_HOME.

Fix bug 11022. Get rid of dependency on SBS_HOME.

adding missing images from last commit

adding missing .ini file to product plugin

update API notes for 2.6

updated API notes for new methods for 2.6

clean up comments

little clean-up/refactor after review of bug 11068

little clean-up/refactor after review of bug 11068

merge

Simplify new IConnectionFactory2

fix npe

fix npe

merge

Simplify new IConnectionFactory2

minor edits to remote conn pages, updated copyrights, fixed some broken links

Fix bug 10878

Fix for bug 10878

fix bug 11068. make sbsv2 variant appender configuration specific

Fix bug 11068 (part 2). Add dynamic text to dispaly -c command and release tree when variant is applied. Remove UI added to support appending to a build config from the project setting.

modify IConnectionFactory2

modify IConnectionFactory2

merge commit

Add support for SBSv2 config specific data. Bug 11068.

fix event leak bug 11107

fix event leak bug 11107

add platsim launch plugin as friend

add platsim launch plugin as friend

Disable old way for adding show all variables menu item.

Fix bug 11067 properly

Fix bug 11067 properly

fixed bug #10971. also hiding more CDT stuff that doesn't make sense in Carbide.

Make EDC the default launcher for TRK launch configuration types.

merge 2.6 changes to 3.0 docs

update index for remote connections changes

Merge license changes

implemented initial new connection dialog changes

Bug 10968: fix MMP view placement of new SOURCE entries

Bug 10968: Fix MMP view placement of new SOURCE entries

Cleanup license info.

Fix bug 10967 -- accept dash in target filename

Fix bug 10967 -- accept dash in target filename

adjusted progress bar on splash upwards

bug 11035 - mike's ui tweaks for installer tab

merge

bug 11035 - mike's ui tweaks for installer tab

initial revert to old branding, splash, header image, colors

Fix error parser tests. We were using deprecated APIs. Also, fix some buggy extraction of filenames from linker errors.

Don't assume App TRK if service has no value at all for 'is-sys-trk' property

Merge commits 1174, 1175, 1176, 1184, 1185 from default: Fix issues not disposing listeners in PNP launch wizard Fix use of PathUtils: do not use new Path() on a Windows format path; this breaks in Linux. Bug 11067: fix some issues with the PNP launch wizard Connected service properties need to be propagated just as their statuses are

Merge commit

Don't assume App TRK if service has no value at all for 'is-sys-trk' property

Connected service properties need to be propagated just as their statuses are

Merge commit

Bug 11067: fix some issues with the PNP launch wizard 1) If Sys TRK is detected, and you select to install a package, a Sys TRK launch is created 2) Error message was confusing when Carbide chose to install a package but SIS configuration was not complete. 3) In an internal layout, assume Sys TRK is more likely than App TRK if we cannot tell from the connection.

Fix use of PathUtils: do not use new Path() on a Windows format path; this breaks in Linux.