Commit Graph

40296 Commits

Author SHA1 Message Date
Tobias Hunger
1de7c954ef ToolChain: Make toolchain combobox in kits active again
Task-number: QTCREATORBUG-14138
Change-Id: I33656e75456832e53cf0b68d319213ea51f3907a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 13:50:57 +00:00
Leena Miettinen
6a3d376cb2 JsonWizard: use double quotes for emphasis
Change-Id: I1b30fc146764517ef00949b9f5ecc3266c03fc78
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-16 13:50:27 +00:00
Leena Miettinen
ceb0349380 ProjectExplorer: fix one more capitalization issue
Change-Id: I92f6e0044ce240e21a3f5865888268bb2bd61de0
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-16 13:33:21 +00:00
hjk
7d6fd6ce5e Debugger: inline DebuggerPluginPrivate::updateWatchersWindow
... into its only caller.

Change-Id: I5521bc92351eecea5154070d0ee0f229edafc51b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 12:54:22 +00:00
Leena Miettinen
31b3855a8c BareMetal: fix language in messages
Change-Id: Ic1c39dc3b7a9b45d8e96b1bd215f0379892730c4
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-16 12:49:37 +00:00
David Schulz
fb4af50bf6 Debugger: Add delay before showing progress indicator.
Change-Id: I70dc3997800649e6920c6a6bece9aef98f2b2146
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 12:45:42 +00:00
Orgad Shaneh
70c475c847 Project: Exclude project directory from include path
Some environments include the project directory by default, and some
don't (e.g. qbs).

In order to avoid compilation errors on the environments that don't,
unconditionally exclude the project directory.

Change-Id: I8552a269735b42efff1839fb18ce863eed711b7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-16 12:41:30 +00:00
hjk
51edafece5 Debugger: Rename WatchItem::{color->valueColor}
It's the color of the value field, not of the whole item.

Change-Id: I1dd63ae21469ec784aefa278d379f819280067d9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 12:36:12 +00:00
Leena Miettinen
f5498e9fdf VcsBase: Add comments for translators
Change-Id: Ib805a1fe610fb9b6995ce628cf004cd0398e0bf3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-16 12:10:47 +00:00
Eike Ziller
7450a09af3 Plugin view: Fix sorting
Broke after moving to Utils::TreeModel. Use QSortFilterProxyModel on top
of TreeModel (can later be used for filtering as well).
Additionally we need to make sure to report changes only for the changed
column now, because otherwise QSortFilterProxyModel thinks that the
change could make re-sorting necessary, and does that in a non-stable
way.

Change-Id: I9fd12c55a45aba4c05f8e318ae8ea9a4ab9f3310
Task-number: QTCREATORBUG-14107
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-16 11:48:27 +00:00
Leena Miettinen
deae570c5d ProjectExplorer: fix punctuation of messages
Change-Id: I76d5d516ffc8e184607a8a22fb8c8838eb3ebb1d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-16 11:23:19 +00:00
Leena Miettinen
5a1400c5f0 Valgrind: capitalize tool names in messages
That is the way Valgrind.org writes them and the
way we write them in the docs.

Change-Id: Ib3775cb0a10e6946221d8aa842111d069231d36c
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-16 10:51:36 +00:00
Daniel Teske
c874e1dd73 QmakeProjectManager: Fix node addition order
First add the nodes, then add the subnodes. This is the correct
fix for

Change-Id: I50834ba7e0221623abe2954c88c47322677c142d
Task-number: QTCREATORBUG-14134
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-16 10:41:41 +00:00
Leena Miettinen
089f1b1bb3 ExternalTools: fix capitalization of UI strings
Change-Id: I4ac7710070dd525ffddecc2012ab75cc84a3d26e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-16 10:34:49 +00:00
hjk
779f55ff37 Debugger: Report LLDB breakpoint address after resolving
Task-number: QTCREATORBUG-14086
Change-Id: I7dcdc62196671583505a2e011ed04fbdd3227de6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 10:32:20 +00:00
David Schulz
40dd248178 Debugger: Show progress indicator while updating locals.
Change-Id: I4b26cbe71f5936f367f9add2b3a6c812446835d8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-16 10:10:05 +00:00
David Schulz
467c441c93 Debugger: Fix using the same watcher number twice.
Counting the watcher number in a global scope, so they don't get
reinitialized incorrectly with a new engine.

Change-Id: Ifd9efb320e2c0f20b2e2845348a98961f72bf28c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-16 10:08:04 +00:00
Eike Ziller
9f545843d3 Search & Replace: Save some horizontal space
Invoking global search & replace would greatly increase the main
window's minimum size, so arrange the search and the replace parts
vertically.

Task-number: QTCREATORBUG-8770
Change-Id: Ia8ae8554a6c089e56b918192dc7ae33cf3e9a615
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-16 09:13:26 +00:00
Nikita Baryshnikov
4b6ee5881a PluginManager: share ExecuteOnDestruction with utils
Change-Id: I895d0ae48c36030e58aea1676873bd285680a661
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-16 09:13:06 +00:00
David Schulz
954feb48b8 Cdbext: Fix adding watchers.
Change-Id: I65a34460237308d76a202ac08d3b2180f532c934
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-16 08:59:28 +00:00
David Schulz
302148e2c5 Utils: Remove assert when hiding progress indicator.
Just return silently when trying to hide a progress indicator
that wasn't initialized by showProgressIndicator.

Change-Id: If8c68dbc9de481c8b1cc6b8dd38c9d8e70b00065
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-16 08:27:22 +00:00
Daniel Teske
f34773e9f2 QmakeProjectManager: Don't offer kits with invalid qts
Change-Id: Ic30a9eba40c5a3934a65006f730ae52de3eab852
Task-number: QTCREATORBUG-14001
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-15 11:33:59 +00:00
Orgad Shaneh
cde50f23fc Tests: Fix compilation
Change-Id: I7cb3b5636413abfc52578e8ae0c43f745efa2f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-14 17:26:12 +00:00
Orgad Shaneh
a341094a68 C++: Fix preprocessing of comments within function-like macro
Task-number: QTCREATORBUG-9535
Change-Id: Ifd94f674214314b3694be74cca297ddab873cd8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 14:34:07 +00:00
Eike Ziller
2a2d0a0c44 Remove unused constants.
Change-Id: I95073d8b0b73398bc48b7937d50a1bcced1e8cc1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-13 14:06:31 +00:00
Eike Ziller
58ffa2cf5f Never save Welcome as the mode to restore for sessions
With the recent fix for restoring the mode when restoring sessions
(0d10ecd668), it would save and later
restore Welcome mode when switching sessions on Welcome mode.

Change-Id: I285dc1f25734b8358ca04cfdb887aafa93576c3d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-13 14:06:23 +00:00
Nikolai Kosjar
3b2a13e9c9 Clang: Offer snippets in completion
Change-Id: I3d0cce5d408d11998aec024b23d9a218a75df3a3
Task-number: QTCREATORBUG-12935
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-03-13 13:55:16 +00:00
Nikolai Kosjar
6a94f7e355 CppEditor: Add basic test for ExtractFunction
Change-Id: I44f2edb2905e202669630ab5da85066011491fae
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-03-13 13:41:37 +00:00
Nikolai Kosjar
251b444cfd CppEditor: Fix Follow Symbol on trailing return type
For the function

    auto foo() -> @Foo {}

whereas '@' denotes the cursor position, we detected the expression
under cursor as "foo() -> Foo" and tried to resolve the member "Foo"
within the type of "foo()".

ExpressionUnderCursor can't detect whether we are on a trailing return
type since it only looks at the tokens. Thus, check also the AST.

Task-number: QTCREATORBUG-13096
Change-Id: Ifc14e402fb70e722940e5fa13f1eaaa9973362e4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-03-13 13:41:08 +00:00
Nikolai Kosjar
3ab5e5231c CppEditor: Extract some functions
Change-Id: Ie564c35b106981d986881f12495ca3cab578c720
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-03-13 13:41:04 +00:00
Nikolai Kosjar
4e1d281963 C++: Fix crash on invalid function qualified name
Task-number: QTCREATORBUG-14135
Change-Id: I94e850f729bd3dbf4212960c7a980a1f118030b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-13 13:21:04 +00:00
Christian Stenger
66c29ea8ec Squish: Fix tst_CSUP03
Change-Id: I6556440ebcf77ae3164c4f659ff1c4b6e189d6ea
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-03-13 13:08:07 +00:00
Daniel Teske
cbc62a2905 FlatModel: Fix a crash on restoring session
Still wondering how exactly it happens. This results in parent()
returning a invalid QModelIndex() for a valid QModelIndex() which
should not happen, but this prevents the crash.

Also add some minimal logging.

Change-Id: I36559c1f9cda39e8b8a80f487651ad58f7c2cc05
Task-number: QTCREATORBUG-14134
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-13 12:59:05 +00:00
Tobias Hunger
1c8b691620 DiffEditor: Do not soft-assert when saving
Do not soft-assert when saving a diff that was saved before.

Change-Id: Iebe06f2bf2ab966869181e0237ed6cc69b2f6045
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-13 12:58:59 +00:00
Eike Ziller
ca41c24cc6 Find: Show number of replaced items after replace all
Show a fading indicator over the editor, or over the main window in case
of global search & replace.

Change-Id: I84a982bcfed558c0f84c08c3625a0cad4c5409d6
Task-number: QTCREATORBUG-3494
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-13 12:01:57 +00:00
Orgad Shaneh
a320daff86 CppTools: Add a failing test for partial template specialization
Task-number: QTCREATORBUG-14036
Change-Id: I7545bfa40ec3e1399d57bf5ab2486318aa1fcb9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 11:30:07 +00:00
Orgad Shaneh
c9b71a268b C++: Provide better output on preprocessor test failure
Make the expected output copyable to the test.

Change-Id: I4fc61682f14d0de054a11d2ffa4a0f36ede0e500
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 11:28:11 +00:00
Daniel Teske
cfe69e6902 AndroidManifestWidget: Fix resizing behavior
This time for real. Change layout from
QScrollArea
 -> QStackedWidget
    -> GeneralPage
    -> EditorPage

to
QStackedWidget
  -> QScrollArea
     -> GeneralPage
  -> EditorPage

Change-Id: Id0d4baca297a5b4d58292fa72faa62b66c91a2dd
Task-number: QTCREATORBUG-14127
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-13 10:42:11 +00:00
Christian Stenger
c9dc686a04 CdbExt: Fix compile warning
Change-Id: I52bbf904a3a6a3cd3d5dcab34e649a44d406af98
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-13 09:53:56 +00:00
Tobias Hunger
a053724c28 Debugger: Refresh list of debuggers in kits options page on changes
Task-number: QTCREATORBUG-13991
Change-Id: I06ff6daea88e14b4193e4f1a71d768b528d80bf9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-13 09:33:26 +00:00
David Schulz
9c5a56a38b Cdb: Reduce usage of deprecated WatchData.
Change-Id: Ie3d3355e51761cea7e0284bbb3e0177d5a443f36
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-13 09:01:15 +00:00
Christian Kandeler
4334c119cf Clear old analyzer issues on tool start.
Change-Id: I54f7791c15e05ca5c85c8b4059f80b050de57282
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-12 16:01:46 +00:00
Daniel Teske
d108a54aab QmakeProjectManager: Don't rerun qmake for debug builds
With a release Qt build. Wrong bit fiddeling.

Task-number: QTCREATORBUG-14129
Change-Id: I7021ff74c9936e6007eec863e4ebfd948e6dbe90
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 13:53:53 +00:00
Eike Ziller
d519514810 Pull 3.4 binary artifacts
To get the msvc2013 runtime installer

Change-Id: Id2c8fe8464bbd1d7ab30d265439360f8111e8b62
Task-number: QTCREATORBUG-14130
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-12 13:30:58 +00:00
Christian Stenger
77be0cb57e Dumper: Fix accessing None type - again
Change-Id: I265e316a1168310f220aa449528790c4bfec41d8
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-12 13:03:44 +00:00
Christian Stenger
839081dbc5 GlslEditor: Fix crash
Task-number: QTCREATORBUG-14116
Change-Id: I48549806b7108d31519dc573039496b727e7a0af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-12 12:55:59 +00:00
Alessandro Portale
57d2d6eb53 Help: Change OSX shortcut for bookmarks to Alt+Meta+M
The default shortcut for Help bookmarks Meta+B overrode the shortcut for
"cursor back". This patch changes it to Alt+Meta+M, which not only
removes the conflict but also makes it the same shortcut as the one for
the editor sidebar bookmarks.

Task-number: QTCREATORBUG-13093
Change-Id: I6f4f6c4891c34a3a00c39632bb0dae119d73cb99
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-12 12:23:03 +00:00
Christian Kandeler
819d3a753c QmakeProjectManager: Fix qbs build.
Change-Id: Ibc5ae05400cfc95dbcb60780accbb3907f697e32
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 11:30:14 +00:00
David Schulz
739bde079b Cdbext: Fix the expression returned for watchers.
Returning now the expression that was used to
add this watch, not a fixed up value in the
*(Type *) address format.

Change-Id: I7cb49b3f6370a6b25758c2a2240a004d1bc2f8a3
Task-number: QTCREATORBUG-12801
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-12 10:40:04 +00:00
Robert Loehning
5930ded264 Compile fixes for MSVC2010
Change-Id: I9e72edad53eff88911d5ce4e9a26905a5393d411
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-12 10:25:30 +00:00