Commit Graph

39760 Commits

Author SHA1 Message Date
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
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
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
Marco Bubke
cda1b6d246 Git: Use Core::AsynchronousMessageBox
Event loops can lead to crashes so it is better to use a dialog which has
not it's own event loop.

Change-Id: Ib703aad698f270b1fa491731adee131ad8b081e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 20:53:14 +00:00
Orgad Shaneh
e9a6e99011 Valgrind: Port to Qt5-style connect
Change-Id: If5f36bb262b932b60133d4301ab614311ce1feee
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:53:19 +00:00
Orgad Shaneh
5b22e292bc ProjectExplorer/Valgrind: Disambiguate signal name
error => processError

To make it easier to use Qt5-style connect

Change-Id: Idfa987512ebb7d1c1c02d3cd01b2d05088cbf38a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:52:12 +00:00
Montel Laurent
250cc0640b Port to new connect api
Change-Id: Ifa29f380789c28cefda5dfdf497df42163fb2f94
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:15:04 +00:00
Nikolai Kosjar
478914a9ce CppTools: Unexport ProjectFileAdder
Change-Id: Icf53019b594a5c45b06f7f1fab0f4bf36e891918
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 16:08:26 +00:00
hjk
77db03a94d Debugger: Update watchers and return value views properly.
This was a regression after the watch model changes.

Change-Id: I4cf369d972b9a6e2f52800556acbd3711744724c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-09 16:07:00 +00:00
Lorenz Haas
711dbdec29 CppTools: accessSpecToString returns the plain name of AccessSpec
Change-Id: I840160a8f5b1c86d621f3334556a74ccb7176ba8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:54:19 +00:00
Lorenz Haas
cedd9bf5e6 CppEditor: Handle empty member base name in GenerateGetterSetter
Change-Id: I7b63f636520a9dcc8e6b62ab1b80181d023c478b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:54:06 +00:00
Lorenz Haas
5b3e26ad30 CppEditor: Remove all leading/trailing "_" for a variable's base name
Change-Id: Iea1aa4ca3f34d11d2e55ce56572c3b19af5743e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:53:40 +00:00
Lorenz Haas
a51acf42ef CppEditor: Create only getter or setter member function
In addition to create both getter and setter member functions at once it
can now be decided to only create a getter or setter member function.

Task-number: QTCREATORBUG-13874
Change-Id: I9127a31b7d87dc91619abb2e2335bd8221f170a2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:53:22 +00:00
hjk
2fe69b60dd Debugger: Rework Tooltips. Again.
Too much layers of complexity. Instead of keeping an eye on
the "live" tree model and switch to a static StandardItemModel
whenever live synchronization is not possible (and do all the
tree view snake oil magic that's needed to make the switch
appear "smooth") keep static copies of relevant parts of the
live model, and update them whenever the the live model changes.

Change-Id: I88a7de67f7703cd2fed041351346b1c7ada0839e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 14:33:48 +00:00
Christian Stenger
d24fab71eb Utils: Avoid accessing null pointer...
...and make sure model is propagated when using copy constructor.

Change-Id: I95b95ebb7f6058adc73bc6e73b4f23a87012a2b2
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 14:04:06 +00:00
hjk
bca7015ce8 TreeModel: More sanity checks
Change-Id: I5f452c94ba4970cadda7840b8a5bcbe8871d84ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-09 11:30:35 +00:00
Nikolai Kosjar
b1e36da139 GLSL: Remove unused RecursiveMemoryPool
Change-Id: Id9a94e095d6f316a947750d77246393c02db63ad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:37 +00:00