feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,752 Commits 108 Branches 368 Tags
cfc89a685e96653f48f27647a13766d29c60a186
Commit Graph

1019 Commits

Author SHA1 Message Date
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8 
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
 2013-05-27 17:17:40 +02:00
hjk
78cea9ee24 Debugger: Make kit parameter in fillParameters() non-optional 
Change-Id: I1b4dde1a63c8e2eb030cab3580abed845b270631
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-27 15:34:47 +02:00
David Schulz
87e516fa71 Debugger: Add core function returning string list settings. 
Change-Id: I03caaf59bf6d41845b3f68194701579d7383e638
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-27 14:42:28 +02:00
hjk
4ae9f3778f Debugger: Fix passing connection when starting from commandline 
This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-27 13:01:20 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7' 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
 2013-05-15 10:21:47 +02:00
Daniel Teske
9f029d7acb Fix Breakpoint storing in session 
Task-number: QTCREATORBUG-9253

Change-Id: Idf517286394796e516115009789e6ff7df527c91
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-07 18:59:08 +02:00
Aurindam Jana
aa93f25626 QmlDebugging: Attach to QML application 
Specify project source directory and sysroot.

Change-Id: Ie9287ef4da023159b131e67de51ffc218c4d2a70
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-05-07 10:52:32 +02:00
Aurindam Jana
8fe5ac405e QmlDebugging: Set correct host when attaching to an application 
Change-Id: I32030b5320f6de129af77fbde28cf7a4a048d9dc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-05-06 15:21:43 +02:00
Eike Ziller
b450b3071e TextEditors: Separate away methods that actually work on a document 
Introduces ITextEditorDocument. This is part of a more general "use
documents instead of editors whereever possible". It will allow to move
to e.g. ITextEditor::openedTextDocumentContents() instead of
ITextEditor::openedTextEditorsContents().

Change-Id: I5ebceaa257a0d2c3e8ac4ac51b9b08b6faa42487
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-19 16:21:30 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
 2013-04-18 09:22:19 +02:00
hjk
b5eac91b54 Debugger: Re-enable thread combo box for core files 
This fixes a regression introduced after 2.5

Task-number: QTCREATORBUG-9110
Change-Id: I72450d7c6797910e789f78c7478fc7dd3d6f6228
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-11 18:05:19 +02:00
Tobias Hunger
ddafdf55de CppTools: Rename files to comply with coding standard 
Rename ModelManagerInterface.(h|cpp) to cppmodelmanagerinterface.(h|cpp).
Rename TypeHierarchyBuilder.(h|cpp) to typehierarchybuilder.(h|cpp).

Change-Id: I035d833fd205d7460819bd0fb7031294359032f9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-10 11:43:22 +02:00
Tobias Hunger
ea23948efb CppTools: Use namespace CppTools consistently 
There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.

Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-08 13:21:31 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger 
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect 
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 14:56:12 +02:00
Eike Ziller
96a5245d8e Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2013-03-26 13:10:09 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Friedemann Kleint
92207c96b7 Clean headers in ProjectExplorer. 
Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-26 12:37:29 +01:00
Daniel Teske
459655b42b DebuggerPlugin: Adjust to MessageManager api change 
Change-Id: Iea8630ae08085fe71586a5e780193a0c0c955801
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-22 13:48:50 +01:00
Friedemann Kleint
85d12bb409 Clean headers in debugger plugin. 
Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-22 10:00:00 +01:00
hjk
a700ec1b9c Debugger: use Id::toSetting when writing settings 
Change-Id: If3bbf526eee51aeb60f2fe377a432a14cf01e0eb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-21 17:38:19 +01:00
hjk
3824d90168 Debugger: Remove deprecated use of Core::Id(QString) 
Change-Id: I8193e4d43c198674469d8d374bc66b7970b90f0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 17:14:39 +01:00
Robert Loehning
dbeb36b03e debugger: Avoid failing assert in theId() 
Change-Id: Ic5895a6c8f8402d4abf0d66ab334caa5815de7dc
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 11:18:58 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
 2013-03-18 10:19:14 +01:00
Orgad Shaneh
14e35b5dc4 Client: Block until editor is closed 
Change-Id: I06bd4425008103be3a4c8f64b6dff8f7df30c552
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-15 12:24:52 +01:00
Aurindam Jana
b35ca65801 Debugger: Enable/disable debug button 
The debug button should be enabled or disabled after
checking if the project can be run in DebugMode.

Change-Id: I2700c1de290f89bae9456319c2e93857374838ed
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-13 12:58:40 +01:00
Friedemann Kleint
68cd15382d Fix Krazy warnings about includes/header guards in Debugger. 
Change-Id: If547a0002d37710fac58c1a13bacc48cf531bed7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-12 12:49:48 +01:00
Friedemann Kleint
659470f940 Fix launching the debugger from the command line. 
Delay parsing of parameters until the kits are loaded.

Task-number: QTCREATORBUG-8876
Change-Id: I091dfabb73649e3fe87308e5a5c6c4502b00fe66
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-05 11:48:10 +01:00
David Schulz
c09ff4b72f Debugger: Enable debugging of mini dumps on windows. 
Task-number: QTCREATORBUG-8834

Change-Id: I75ed8014076644e987f7883e762a2ed395d0ecdf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-26 10:21:22 +01:00
Leena Miettinen
117f6164e0 UI text: fix capitalization in debugger 
Change-Id: If69a218abbbeb4ae169ce4496b58484adab2470a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-12 17:17:47 +01:00
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
Tobias Hunger
7a70b4f135 LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp) 
I ran once too often into them being called applicationrunconfiguration.(h|cpp)!

Change-Id: I280a3280173b80d4d955faddedf11688786eee14
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-28 14:46:47 +01:00
hjk
b6f187d0f2 Debugger: split editor related code off watchutils.{h,cpp} 
This is now in sourceutils.{h,cpp} to make watchutils.{h,cpp}
better acessible to the debugger auto-tests.

Change-Id: Ie87e715bc7018ca190a460c37dfd19bc897059f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-25 13:54:34 +01:00
hjk
794b41581b Debugger: remove isEditorDebuggable 
It was returning 'true' unconditionally for a while.

Change-Id: Ia99bdb3c525641f757dacbba148b68d677f4d632
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-24 16:10:10 +01:00
hjk
2a0bb34911 Debugger: split fixCppExpression into some common and some cdb part 
Task-number: QTCREATORBUG-8446
Change-Id: I79abc7f75779db15bd8700c085b9cd57411bb2e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-09 16:02:46 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
hjk
cbf75f676a Debugger: de-noise 
Change-Id: I48c9b1353d80ebd85c81aa8a03d0be200781122a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-30 12:55:52 +01:00
hjk
e833b794b3 Use Core::Id in ICore::showOptionsDialog 
Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-29 19:04:30 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
 2012-12-14 08:20:49 +01:00
Aurindam Jana
d1ad1c303b Inspector: Add tools to debug menu 
Task-number: QTCREATORBUG-3812

Change-Id: Ifa0ff5d030d6dc3e88df64523a81847314ff26ed
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2012-12-11 23:19:28 +01:00
Aurindam Jana
1b916719d0 Inspector: Enable/disable tools on engine state 
On a debug break, inspector tools cannot be used as the
gui thread is blocked.

Task-number: QTCREATORBUG-5466
Change-Id: I808d751b1ade7e4a5c98e87fec7bb4cb02715ad8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-12-11 10:05:45 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +01:00
Orgad Shaneh
b7fea5fe53 Debugger (qbs): Compile with QT_NO_CAST_FROM_ASCII 
Only comments were adapted

Change-Id: Id1393d512ed950ca747267c1e024d54e3bfc279d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-27 08:48:38 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:57:35 +01:00
hjk
6841976aa8 debugger: give access to the section names in a shared object 
Via context menu in the modules view, gdb-only for now.

Change-Id: I1163540cd9894c52243bb1bf0c2afc881e793863
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-09 11:44:22 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
 2012-11-09 11:20:10 +01:00
Aurindam Jana
86c14292d2 QmlDebugger: Fix Remote QML Debugging 
The host address is now retreived from the kit info.
Incase, a device is not associated with the given kit,
the host is assumed to be localhost.

Change-Id: I659d2d64ec78dc1b10c80c97390994a56ff26344
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-07 15:40:15 +01:00
hjk
97bcf9ea96 Debugger: Make autotests auto-configure and compile test project 
Change-Id: I2b939409374508687f4ea2e0d4cae65ac62498c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-06 16:27:50 +01:00
Friedemann Kleint
2e40c54ea3 Debugger: Remove #ifdef Q_OS_WIN from hostutils. 
- Provide stubs for Non-Windows
- Reduce #ifdefs, check Abi if possible.
- Remove unused winGetCurrentProcessId().

Task-number: QTCREATORBUG-8141
Change-Id: I80558ca4e52e87c7371597ea07c091af08097b34
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-02 15:40:41 +01:00