Commit Graph

136 Commits

Author SHA1 Message Date
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
hjk
6dd8726a16 Debugger: use Id::{from,to}Setting when appropriate
Change-Id: I7b6d68d9c141c485ec27d6fc45f54ee2911b7349
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-18 12:33:27 +01:00
hjk
61b2926a1a debugger: don't restrict kit selection for attaching
Change-Id: I5bf9f57cb551c5fc3d02485c2e25a2ef914d5b53
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-16 16:53:23 +02:00
Orgad Shaneh
47e42e53d0 Debugger: Fix showing/hiding of form rows
Change-Id: I1f6afa472d5ca30c15a84a49ea852063247c5210
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-16 11:21:47 +02:00
Orgad Shaneh
041b82b665 Debugger: Fix crash
Change-Id: Id21eb93178c97b3317d1ac7951f81365dfa6d31a
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-15 15:51:52 +02:00
Orgad Shaneh
3d6f816b67 Debugger: s/Profile/Kit/
Change-Id: Ic0e5e8f784953d721833fff78a846ff13844a298
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-15 12:13:39 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Friedemann Kleint
d339637701 Move debugger kit settings into a separate dialog.
Change the DebuggerKitConfigWidget to contain a display label
only. Add a Button with a menu for "Autodetect" and
"Edit...".

Change-Id: I8ec17966ef220c81fb8b145a61df4408d5950da9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 16:27:15 +02:00
hjk
507334526e debugger: make 'Attach to Remote Server' port customizable again
This was a regression after the target changes.

Change-Id: I7dd382d741c64116afee418b12f8774dea4da70a
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-09 14:16:04 +02:00
Friedemann Kleint
c3f50e3192 KitChooser: Introduce virtual methods for Debugger.
Introduce virtual methods such that it is possible to
write derived classes for specific KitInformation classes,
allowing for filtering and setting text and tooltip.

Remove debugging-specific code of KitChooser from
the ProjectExplorer.

Move populate() away from the constructor as not to call
virtuals from it.

Implement DebuggerKitChooser. It should no longer be
possible to to choose an invalid kit for debugging
from the debugger starter dialogs.

Add a protected constructor to DeviceProcessesDialog
allowing to pass a KitChooser.

Change-Id: I8c683a2da7d69bfbccdc08213cb47d69a0df8b3e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:20 +02:00
Friedemann Kleint
af6bbc442e Add debugger engine type to configuration.
Introduce a struct DebuggerItem as a debugger configuration
item, containing debugger engine type and binary. Store
information as a variant map. Add a combo box.

Remove engine guessing logic. Parts of it are still required
when checking the suggested debugger from the SDK.

Split error checking to be able to do a quick error check
and find only valid profiles in the matchers.

Pass on errors up to RunControl::create().

Change-Id: I08653e2a76ca2c371701082f8173b0b8f8ed462e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:11 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Jarek Kobus
cd91925dcd Fix source strings
Change-Id: I3c96c467f79fa7722c270a5887997294a7042adc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-30 14:34:00 +02:00
hjk
8d3c1cfb05 Rename FancyLineEdit::setHistoryKey -> setHistoryCompleter
similar for HistoryCompleter *m_completer -> m_historyCompleter

Change-Id: Ic7aedc19cbb865f0a5bdddb9565a7411fd06dfde
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 16:18:39 +02:00
hjk
29ec32a531 ProfileChooser: make more robust in case of no configured profiles
Change-Id: I53945617cc616d2bfe4726b4e6e45cad7b400c44
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 15:33:09 +02:00
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:37:59 +02:00
hjk
08cc1e7d6a historycompleter: make key explicit
Change-Id: I1560e379639a02a2decf46c4e6b015bd6042c6b7
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 14:59:14 +02:00
hjk
f880c0e5b5 debugger: use host from profile for the attach to qml option
Change-Id: I81903ba752b9758fb4b9e342d40ac756716caecf
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:36:50 +02:00
hjk
f1b5d6a569 debugger: use Profile directly for fillParameters instead of its id
Change-Id: Ifaf663ee1827976e45e68e309b19c2f233a05ac1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:35:40 +02:00
hjk
d9ee771501 debugger: fix adding of line in start & debug external dialog
Change-Id: I15356cd6be1882540a379961da0efb4d9d64389b
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 14:07:38 +02:00
hjk
98a5fefb9a debugger: simplify the handling of the start script option
Script will be used if and only if there is one given. No extra bool.

Change-Id: I095e01b2243f0fa1f7ba2ce9591e3d67b6de5241
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 14:03:14 +02:00
hjk
379e4ed3c7 debugger: Merge "Start and Debug {Local,Remote} Application" dialogs
Change-Id: I81a95b592c480254d84d45e71d95f924944db1eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-13 17:19:55 +02:00
hjk
7a6beafa69 debugger: merge attach to local and remote process dialogs
This also merges a larger part of the two code paths.

Change-Id: I84a88c53ebc0073becac88ba04e63efd9a4a98b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-08 12:15:45 +02:00
Robert Loehning
39f296460f Removed redundant space from string
Change-Id: I42ccd2d4bdc79bbc4bd1faf7450af1b608a17edb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-06 14:53:01 +02:00
Friedemann Kleint
686c085062 tr()-Fixes for 2.6.
- Fix typo.
- Fix invalid usage of tr() in ServiceBrowser.
- Remove plural form in Debugger.
- Give ElfReader a proper tr()-context.

Change-Id: Id3172f0e093fd5fbe328061d32d2ba7fcfebaca7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-30 18:45:13 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-27 17:08:12 +02:00
hjk
26e7ed14b7 debugger: remove unused code
Change-Id: I105aa0433530abb4e9f53de19c0846281ccda0cf
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:00 +02:00
hjk
c6f7eaea59 debugger: remove channel lineedit in StartRemote dialog
The information can be retrieved from the Profile information
nowadays.

Change-Id: I964cb4a782bb746bb97edbdb03cc99d64153106c
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:38:50 +02:00
hjk
e3a5e27eb7 debugger: merge local and remote core selection
Change-Id: I1659eb5a13283814d307c4b4b7adaec87bbbbe9d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 17:11:19 +02:00
Friedemann Kleint
1b9cf76600 ProfileChooser: Introduce flags specifying which profiles to list.
Introduce flags to filter profiles that have a debugger
configured, restrict to host abi and include invalid profiles
(which is not relevant if only debugging is desired).
Introduce convenience flags for debugging.

Introduce populate() function for cleanliness.

Change-Id: I476c40cc9a59e4dd5b1bc7c49597e9169c053754
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 16:54:59 +02:00
hjk
02d3fc9062 debugger: simplify label handling in special launch dialogs
Change-Id: Id009db64c885280f6925369b4daa7950e318899c
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 14:31:34 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
hjk
f820f10bc1 debugger: code cosmetics
Namespaces, whitespace.

Change-Id: I83df57b32a1a31b208181d65849688c09941a0be
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 16:27:49 +02:00
hjk
ebe6229980 profilechooser: run init() in constructor
Change-Id: I4387b52f2d929ffa096bf2d931eb692b6798f45a
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 16:27:06 +02:00
Orgad Shaneh
187ac69a5f move ProfileChooser from Debugger to ProjectExplorer
Change-Id: I5a4dcd5b9101118de8c88b6d26af5a9dbb32ba54
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 13:15:29 +02:00
Friedemann Kleint
7c8070afec Fix warnings about id being construct from 0 or empty string.
Change-Id: I7776b9035a2decc5e840e0d534d05b42c821e9f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 16:25:13 +02:00
Orgad Shaneh
9117c6b059 Debugger: Fix "Attach to Remote" dialog
Change-Id: Id59289afb7d74ea150394cf4ddce2a4be56d10d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-16 15:19:04 +02:00
hjk
bb0329a319 debugger/analyzer: inline the small start dialogs
Easier to refactor.

Change-Id: I151364182df841e7e543f480b1836a1b1897e913
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-29 08:58:28 +02:00
hjk
ded2dd12b8 debugger: adjust to profile changes
This replaces the debugger command, sysroot and target abi fields
with a profile id.

Change-Id: I831c42ff8624fcfa520c2f28f6f06d73191b2680
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 15:30:15 +02:00
hjk
579e95af8f debugger: more Profile adjustments
Change-Id: Icb7f62da5a23e3208e1b75524118f1b75bd7a4c8
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-27 15:00:12 +02:00
hjk
6a6c5e5af5 debugger: port 'Attach to Core' over to new Profile architecture
Change-Id: I89e743314025fe715982b4c43849ce128e014f55
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-26 15:36:27 +02:00
hjk
b9d15b113f debugger: remove a few too-fancy typedefs
Change-Id: I0c8ba3c2d22ca7128527da42b81919dabbd82d14
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-16 11:15:28 +01:00
Denis Mingulov
87b1dc25a1 Debugger: use QString::fromLatin1 instead of QString::fromAscii
By source - latin1 is really expected as there is no any check
or usage of QTextCodec::setCodecForCStrings() currently.

QString::fromAscii() might break 'Latin1' input in some cases.

A quote from documentation about QString::fromAscii():

"Note that, despite the name, this function actually uses the
codec defined by QTextCodec::setCodecForCStrings() to convert str
to Unicode. Depending on the codec, it may not accept valid
US-ASCII (ANSI X3.4-1986) input. If no codec has been set, this
function does the same as fromLatin1()."

Change-Id: I49cf047ca674d2ec621b517c635d1927bb2e796f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-16 10:27:04 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Friedemann Kleint
de5ed4a043 Debugger: Add "Recent:" combo for Start External/Remote.
- Add combo box listing the last 10 elements of history.
- Introduce parameter class for the dialogs that can stored/
  retrieved as a QSettings array using template helpers.
- Give dialogs a static 'run()' method that returns
  the DebuggerStartParameters to handle the history, move
  code from the debugger plugin to the dialogs.

Change-Id: Ieb15f7c8ef9489f925b9d2f47ec09feebcf73826
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-06 18:20:05 +01:00
Orgad Shaneh
f90128c1f1 Debugger: Use toolchain for remote debugging
Just like the other dialogs

Change-Id: If2a87a688f5d3653bca02912dc9052399f72de87
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-27 12:30:50 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
hjk
4cc4567a80 debugger: remove unneeded include
Change-Id: I4e8977f6317d45d6e6156de07bedf9955e93a915
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-24 17:10:44 +01:00