feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
39,805 Commits 108 Branches 368 Tags
56aadc407d7becadec794e660ae7d7c20e820e0c
Commit Graph

39805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
 2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
hjk
f1c5889e77 Debugger: Some code modernization 
Qt 5 signal/slot, a few auto.

Change-Id: Ia17f1b3dcd41dfe0a373c14e7c1d34d210d084f1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 15:14:55 +00:00
Eike Ziller
0eabe62786 Merge commit 'd83fb4d63c9fd92e0e6f429cbd56fa244bddc093' 
Change-Id: Ibd6f8cd83c60f0c65387b62b7692aa8a4c025acb
 2015-02-12 15:30:33 +01:00
Nikita Baryshnikov
052de4d178 ManageDefinitionsDialog: Fix regression 
after 102e49ca37

Change-Id: I5f2fb7c3309d0c14e4c470bb2716ee000d8ddc95
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-12 13:32:42 +00:00
hjk
f91cc66f9a Debugger: Combine some watch related GDB and LLDB code paths 
Change-Id: I20e5f6f04418c931354a07bc3597f6982fcaf942
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 12:49:21 +00:00
Robert Loehning
28971701fd Squish: Don't rely on progress bars when parsing qbs project 
Task-number: QBS-746
Change-Id: I316934884432953e2137d7e97b73fce352be4cac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 12:25:46 +00:00
Christian Kandeler
cf21092ec5 Analyzer: Use QKeySequence::copy for copying to clipboard. 
Change-Id: I238eace2198e5a2329ce7db559e4df354e84cb80
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-12 12:08:16 +00:00
Christian Kandeler
62e30ad562 Update qbs submodule. 
To HEAD of 1.3 branch.

Change-Id: I1b900208dd52978ae0a7cf0a79e2469cfc6928f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-02-12 11:11:54 +00:00
Robert Loehning
e11caa793a Squish: Remove outdated code 
Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:45:44 +00:00
Nikolai Kosjar
921ec6da5a C++: Cache parsing of template ids 
...in order to stop memory intensive parsing for invalid code.

Parsing the test data/snippet "hard" led to a memory consumption of
about 5.5MB and this could easily get up to hundreds/gigabytes by adding
some more "if_<bool_<true>,\n" lines. With the caching, we are at about
1.0MB, even if more lines are added.

The "memory consumption" was measured with valgrind-massif. The stated
numbers are the reported peaks.

Task-number: QTCREATORBUG-12890
Change-Id: Ie7eb00cfc7915552d29bb27410a6b13a486f486e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:40:14 +00:00
Nikolai Kosjar
ae3aa07c4d C++: Remove workaround for crashing if parsing invalid code 
This reverts the changes

    commit beac7b9539
    C++: Fix highlighting after "invalid code"

    commit 78ab287fc6
    C++: Stop parsing a declaration after two tries

which were a work around for QTCREATORBUG-12890.

A follow-up patch provides a proper fix.

Task-number: QTCREATORBUG-12890
Change-Id: I2650a8e41c8ff1180cad9f069e463fc51bd2f1b1
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:39:51 +00:00
Nikolai Kosjar
d68fc038cc QmakeProject: Fix mkspecs dir include path 
1) When the compiler is invoked, the mkspecs dir is the very first
   include path, but the code model got it as the very last (still before
   the system include paths) include path.

2) We had it twice in the include path list.

Change-Id: Ia46b6009359c5799790e6c856113ea133b8212c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:39:38 +00:00
Nikolai Kosjar
e9b94c131c QmakeProjectManager: Shell-interpret project defines 
...since they are meant to end up in Makefiles.

A define like

    DEFINES += SRCDIR=\\\"$$PWD\\\"

was passed on to the code model as

    #define SRCDIR \"/tmp/dir\"

instead of

    #define SRCDIR "/tmp/dir"

Change-Id: I7af5c8d82b3b937ca9db70f6580bab3419fb4550
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:38:06 +00:00
hjk
9df463da84 Debugger: Convert bb extension to use runCommand 
Change-Id: I528c51d2b02dccd91429778ef8c940fe5565345f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:27:33 +00:00
Christian Kandeler
d9408156d1 Analyzer: Put more common code into the DetailedError* base classes. 
Namely:
    - The "copy" action and the corresponding "slot".
    - The context menu.
Plus an infrastructure for adding new common and custom actions.

Change-Id: I4bf8b28b4ad60b4022abbfc0b401c3b832b94560
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-02-12 10:23:45 +00:00
hjk
875d889082 Debugger: Move bbsetup over to runCommand() 
Change-Id: I0a19b28d24cb570651ea84bf7cdbc9a761f85a0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 07:19:48 +00:00
hjk
f65cb6ae4d Debugger: Complete switch to Python for GDB stack generation 
The iteration in Python was only used for the 'native mixed'
case before. Seems reasonably fast and robust now to always
enable it. Also, make the calling code use 'runCommand'.

Change-Id: I10565a725dfaa9bf46c28739c69e9f2546498929
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 16:34:51 +00:00
hjk
e76c4839bb Debugger: Consolidate some GDB-through-Python interaction 
Instead of calling a GDB extension command invoking a function
on the well-known Dumper instance, call the Dumper function
directly. This also makes the code more similar to the LLDB side.

Change-Id: I4b23177eb72a904721b63c578ce7fbfe204f02a2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 15:00:35 +00:00
Orgad Shaneh
2c4b9fb64f BinEditor: Include null chars on ASCII copy 
Replace them with spaces

Change-Id: I2d3cad8c7c34c222d971e3cdf56a85824342e9be
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-11 14:05:42 +00:00
Nikita Baryshnikov
5930e62b84 Utils.Transform: fix stolen const on MFP 
Change-Id: I44ef3bac606a733a81f95472d0ca5bb50ee3bca0
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-02-11 11:39:44 +00:00
Robert Loehning
f2c9cd655e Squish: Prepare help tests for Qt 5.4 
Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 11:13:38 +00:00
Eskil Abrahamsen Blomfeldt
8d27ec664a Android: Fix debugging applications that link many modules 
When debugging an application we will add a few arguments
to the command line for launching the application. We would do
the same for every library etc. required by the modules linked
to the application. At some point, the command line would become
too long and fail to execute.

Passing the libraries, libs_prefix, etc. on the command line
is not necessary, since the parameters are already included in
the AndroidManifest.xml, otherwise it would not be possible to
launch the application from the device itself.

Change-Id: I93a7f64a4ce32ebb2b25c54b0d17ae2b23706e24
Task-number: QTCREATORBUG-13691
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-02-11 11:05:53 +00:00
hjk
85a502ab38 Debugger: Add tooltip to tooltip copy button 
Hard to guess otherwise what it is meant for.

Change-Id: I92221da8d0dbe92b579d0cf97a76224a57447ec0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-02-11 09:03:20 +00:00
Orgad Shaneh
6102b2d697 Core: De-noise DocumentManager 
Change-Id: I5b78e5ac76829a8921039663edab2b8f836c0c7e
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-11 08:53:12 +00:00
hjk
eff2ac7a3d Debugger: Go back to plain QTreeView for tooltips 
Nothing of the BaseTreeView functionality is used, and there seems
to be a off-by-1 in column width computation leading to unnecessary
eliding.

Change-Id: I4426070742801864edfdba4c912ad8cc8a15f7bb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 08:22:47 +00:00
hjk
3ff13acf75 BlackBerry: De-noise blackberryruncontrolfactory.cpp 
Change-Id: I19d50b7a707a769f71d2d0325eff84a21752ac87
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 08:22:39 +00:00
hjk
547855bf02 Debugger: Using DebuggerCommand instead of bbedit call 
Mid-term goal is to reduce the amount of similar code
at least in GDB and LLDB engines.

Change-Id: I4883686a102246be3135ddc694b837b1187ac9e9
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-11 08:06:39 +00:00
Orgad Shaneh
85ed66bae9 Android: Pass some values by reference 
Change-Id: Ic12452320728b161afd2907deb036d0c6d9df644
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2015-02-11 07:34:29 +00:00
Christian Kandeler
772c2caac9 BareMetal: Fix qbs build. 
Change-Id: I6b87bd9ade4ffbb33035691d7bfac8a1f12de763
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 15:55:13 +00:00
hjk
c59c415780 Debugger: Fix off-by-one line in tooltip context 
The first function line (usually containing the function
parameter) was attributed to the preceding function.

Change-Id: Ia2b394cfa5a0edc909bc998bcce6bd92ae5b5b87
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 15:40:03 +00:00
Orgad Shaneh
59fc0fe8f2 Theming: Fix highlighting of focused widget in target selector 
Change-Id: I477a409ed231a291fb9320ce9014853a7e21274c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-02-10 15:32:49 +00:00
hjk
b8ec2d8e73 Debugger: Startup fix after 807c3a5ad2 
Change-Id: I731a2916ba7580caaaeea6a7de72e748c30f31f1
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 15:32:02 +00:00
hjk
bf6aa3cc2b Debugger: Pass RunControl in DebuggerStartParameters 
.. to simplify DebuggerRunControlFactory::doCreate() call.

Change-Id: I4dd0c224968bb8a388ea7f095b940b66ee606ab1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-10 14:27:32 +00:00
hjk
807c3a5ad2 Debugger: Start to disentangle DebuggerStartParameter setup 
Change-Id: Ife19d506146806d965a2552b1390fae4545b3459
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-10 13:00:39 +00:00
Tim Sander
e6104777d7 baremetal: add support for generic projects 
Change-Id: I35729c88414cf69f87252500262aee240c87019b
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 12:51:16 +00:00
Orgad Shaneh
81684ccf63 Valgrind: Fix qbs build 
Change-Id: Ia2152665213dcc89358a9898e90dc915be420f6b
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 12:31:52 +00:00
hjk
9cc22ce4c3 Debugger: Don't access model in view's reset() 
This can legitimately be triggered by from a
QAbstractItemViewPrivate::doDelayedReset() after
the model has been destroyed.

Change-Id: Id0b4f45c8386485a1128bfbeed3366caa87c6bfa
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-10 11:38:31 +00:00
Christian Stenger
c085ac48e3 ProjectExplorer: Fix unit test testFlavorForOs 
Change-Id: Icf4671857c8f2524def40aaef4250068f6789509
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-10 11:36:41 +00:00
Orgad Shaneh
9927eb2c37 Valgrind: Suppress messagebox on SIGTRAP for vgdb 
Change-Id: I5af3a3a67a9c9903337e0035733a74ad482ba197
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 10:40:26 +00:00
Tim Jenssen
d599b4b2d3 fix a warning 
Change-Id: I2faa2b7d8d7b3628335ca57239921e753405127a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-02-10 10:23:50 +00:00
Tim Jenssen
588f88829f remove too much spaces after "return" 
Change-Id: Ibb39ca8bf172caff8749e4d896d772a740a8de6e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-02-10 10:23:43 +00:00
Orgad Shaneh
b4efd0d8c6 Valgrind: Support vgdb 
Change-Id: Id9f653a81d329494017653b8fc7ec9960e20dbcd
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 10:18:32 +00:00
Nikolai Kosjar
4db12d433d Debugger: Comment out unused variables 
debuggertooltipmanager.cpp:98:12: warning: unused variable 'modelElementC'
debuggertooltipmanager.cpp:99:12: warning: unused variable 'modelColumnCountAttributeC'
debuggertooltipmanager.cpp💯12: warning: unused variable 'modelRowElementC'

Change-Id: I141a3b86080e1855b83bb277a5d6a04428925e03
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 08:31:40 +00:00
Orgad Shaneh
5dd11dc214 BareMetal: Support remote channel without port 
e.g. "| vgdb"

Change-Id: Iedae02dab5bbb884d57604605597225fe9a262c2
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-10 08:01:57 +00:00
Orgad Shaneh
42e0ea62f6 Git: Support stash --keep-index 
Task-number: QTCREATORBUG-13587
Change-Id: I23f62b961df73872ae980d95b91a3285c0e367c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:59:40 +00:00
Orgad Shaneh
c9df079885 Git: Improve stash 
* Use explicit "save" sub-command
* Show output in log window

Change-Id: Icd4a47de2e4548322d1ea06f126d0bd6023e67ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:59:35 +00:00
Orgad Shaneh
2a677ce8b3 Git: Save all documents before stash pop 
... and refresh the stash dialog

Change-Id: Iba16efc4f612cd1997493206704100ec57493932
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-09 20:59:32 +00:00
Orgad Shaneh
15e7446fda Git: Simplify stash 
Change-Id: I2df6687d2bc539aa192dff53b4fb7936f20d299f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:59:29 +00:00
Orgad Shaneh
4f079fe17e Git: Support reverting unmerged files 
Change-Id: I8b974cb6ec620b303f9b1918af43e6672460f030
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:58:16 +00:00