Commit Graph

43591 Commits

Author SHA1 Message Date
Daniel Teske
cea36f1376 Fix various context menu actions from project managers
The correct pattern is this: The actions in the build menu are supposed
to be for the startup project. They should use the global context and be
manually hidden/shown if the startup project changes.

This fixes a crash on assigning keyboard shortcut to the edit files
context menu action.

The slot connected assumed that the action could only be triggered via
the context menu. By using ProjectTree;:currentProject() the code now
works even if the project tree is not actually focused.

It also fixes that the "Run CMake" action was shown even in the build menu,
even though a non cmake project was the startup project.

Change-Id: I0bb8086d8b1078b4c71c3b5ba9d7f8596757e724
Task-number: QTCREATORBUG-14728
Task-number: QTCREATORBUG-14768
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-31 14:57:36 +00:00
Daniel Teske
cac53ea41f Utils::PathChooser: Allow the core plugin to extend the context menu
And then use this to add the "Open in Graphical Shell" and "Open in
Terminal" actions.

Those actions cannot be implemented in Utils directly since the Core::FileUtils
depends on the Options dialog.

This affects all PathChoosers, and there's currently no way for a PathChooser
to opt out or have a different context menu. That can be added at a later
point.

Change-Id: I22121c19d66f08785381c7e0bca5317628eb6342
Task-number: QTCREATORBUG-14736
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-31 14:57:09 +00:00
Daniel Teske
06483d3720 Fix "Make" build step not being updated on environment changes
Change-Id: If356830b064229d74f0b69360301c4091bcb2acf
Task-number: QTCREATORBUG-14831
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 12:54:06 +00:00
Daniel Teske
14300191a1 QmakeBuildConfiguration: Offer both Debug and Release in "Add Build"
Change-Id: Iac9749816119dab772c5b6fa34b4d998a68bcab3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 12:53:49 +00:00
Tobias Hunger
52a52ca09f Android: Remove unused constants
Clang warns about these.

Change-Id: I002d97356dd7b6401edc577b69978d5d17a1e404
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-08-31 12:16:17 +00:00
hjk
5829b22b03 Debugger: Also show instruction bytes in LLDB disassembler
Change-Id: I9676e458153b745fc75a5da271524e73959fba03
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-31 11:51:19 +00:00
Christian Kandeler
513c4e0a89 Update qbs submodule.
To HEAD of 1.4 branch. Also do the necessary adaptation in
QbsProjectManager.

Change-Id: I810502c5be14ff8e93c886dae931cd4bceb81d13
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-31 11:43:46 +00:00
hjk
fbbb6ad820 Debugger: Don't use quotes around single chars when editing registers
Change-Id: Id45a919dba4f49e8d389bb3e77bbede5b4d98a89
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-08-31 11:10:00 +00:00
Daniel Teske
be3fc0ef0b Qt Quick UI: Add "kit environment" as a base environment for run
Change-Id: Ica4e63b4b8e56ee6d2ead0ad3a5d1b57de20009c
Task-number: QTCREATORBUG-14701
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-08-31 11:02:32 +00:00
Daniel Teske
f3a0e58843 MiniTargetSelector: Sort build/deploy/run configurations case insensitively
Change-Id: Ifbb305808046ea85f1f250beef3a518842de8b01
Task-number: QTCREATORBUG-13963
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:24:30 +00:00
Daniel Teske
fb1360cd31 Don't parse Makefiles without Command: line
Change-Id: Ied315fda07d2ae8910aca7ce232b01c5cdc36f0f
Task-number: QTCREATORBUG-14291
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:24:09 +00:00
Daniel Teske
eba7d8d196 QmakeProjectImporter: Slightly tweak spec handling
The removed code had actually no effect since it changed a variable that
was not used later. Since we are looking for a kit that has a identical
spec, there's no need to pass any spec in additional arguments.

Also on creating a temporary kit, don't set mkspec if it's the same
as the qt versions mkspec.

Change-Id: Ia37317a5b6fefa603106c8761279577271f32a7e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:23:58 +00:00
Daniel Teske
cac63d1dd0 GccToolChain: Support -D foo
Change-Id: I733e7d308720b23c1cf4226335cc96ad6d89feb9
Task-number: QTCREATORBUG-14792
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:23:37 +00:00
Daniel Teske
ef45750294 Fix detection of qml runtime error messages on Android
On Android those messages are prepended by e.g. W/libuntitled156.
Adjust the regexp to also match in the middle of the line.

Change-Id: Idd2ed8f4de8f4070da4fc673051eb29efe72fa66
Task-number: QTCREATORBUG-14832
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:21:17 +00:00
Daniel Teske
f2b3766808 EnvironmentWidget: Warn the user if a variable already exists
Change-Id: Ia95d6f9fd782745195d79c1be2e76ab1cb36cff7
Task-number: QTCREATORBUG-14846
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:20:53 +00:00
Daniel Teske
13c2c40636 Cmake: Read the build.ninja file only once
The first getCmakeCXXFlags that reads the build.ninja file
stores the contents in the inout parameter cachedBuildNinja.
Further calls to getCMakeCXXFlags just use this cached value.

This prevents excessive locking of this file while constructing
the code model information.

Change-Id: I81e1431194bed6913c69abb2d954068c999a5c1b
Task-number: QTCREATORBUG-14639
Reviewed-by: Tom Tanner
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:20:12 +00:00
Daniel Teske
c9a9f08d0a Cmake Open Project: Allow opening projects that have cmake errors
Change-Id: I3779fbe3f6409139b3d027f96ad390a174c0ff7f
Task-number: QTCREATORBUG-6903
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:19:45 +00:00
Daniel Teske
87b15b4554 QtVersions Settings: Allow the user to sort the qt versions
Rewrite the whole code to use a TreeModel. So that we can
use a QSortFilterProxyModel on top of that.

Change-Id: Idba5095dac897e9fcdaca0f2dcc7c77508dabcc1
Task-number: QTCREATORBUG-6200
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-08-31 10:19:25 +00:00
Nikolai Kosjar
42d8672626 C++: Add tests
...for two regressions that were introduced by

    commit e0594fc9b9
    C++: Fix expensive lookup for boost

Change-Id: I1fa01e626da480ca53e04b4709fec458378e7aef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-31 09:26:00 +00:00
Niels Weber
18cca66ade Fix off by one in tooltip
The Tooltip was talking about bits 0..8, 8..16 etc - that is
one bit too many.

Change-Id: If97217561cd9cf0d32c44c7ceaa4bb50d0be4f31
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-31 09:21:35 +00:00
Ulf Hermann
21a94e5e69 Timeline: Optimize selection tools for fewer scene graph rebuilds
The selection details "windows" contain frequently updated text and can
be moved around in the scene. We don't want their contents to be batched
with the rest of the scene as there may be many events in the timeline
and rebuilding the batch they are in is expensive. The clip property has
the side effect of preventing nodes within the clipped area from getting
batched with nodes outside it. Thus, by setting the clip property on
the details we reduce the number of batch rebuilds for the actual
timeline.

Having a transparent rectangle in there doesn't help the renderer,
either, so we replace it with a plain item.

Change-Id: Ie6bac1324d3bc6b8b3d56e658a766f1f90be9046
Task-number: QTCREATORBUG-14983
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-31 09:19:46 +00:00
Ulf Hermann
f1ede40500 QmlProfiler: Expose flush interval to user
Flushing data while the application is running can distort the results
because the flushing itself takes time. However, not flushing leads to
longer load times in the end and higher memory usage. The best strategy
depends on the application being analyzed and the users should decide
if they want to flush or not.

The settings infrastructure also paves the way for preserviing the
layout of the timeline and statistics views as well as the category
filters across sessions.

Change-Id: I2cdc37c7fc7eb9b05b6870955ddffaa712d6c956
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-31 09:19:32 +00:00
Tobias Hunger
bd9b487584 TextHighlighter: Remove some unused constants
CLang warns about those.

Change-Id: I440b71f06cc3791dd88723feb0264fac2a0672e6
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-08-31 08:16:41 +00:00
Mitch Curtis
f4a9eaf3a9 Dark theme: make application output error message text color readable.
It was a pure red, which is really hard to read against a dark
background. This patch makes it a pastel red, closer to the fatal
error text color.

Change-Id: If4b402b2887149f040a00a9493f550afb296382b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-29 19:53:41 +00:00
hjk
d16aed4304 Debugger: Add display of mixed disassembler output for LLDB
Change-Id: I4997ce4fb4ce6a61cca67e36abb84c61a1c120f5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-28 13:44:49 +00:00
Friedemann Kleint
59c729f864 PatchTool: Enable using git instead of patch.
Git for Windows as of version 2.5 no longer ships patch.exe,
which breaks Qt Creator's patching/reverting features.
Enhance the PatchTool to be able to use git for this by automatically
prepending the 'apply' argument.

Change-Id: I5ce98ebc61e2459b855b93b7b33495575170ae99
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-28 12:18:56 +00:00
hjk
47c79a102f Debugger: Fix handling of large registers with LLDB
Change-Id: I12a7a9e43922291c6bff77be5fefea4db6cb5482
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-28 11:11:22 +00:00
Nikita Baryshnikov
4ec9019104 Debugger: fix metatype declaration macro usage
in places where we do not need it.

Change-Id: Ifb7eba6f46bf79f2cfe968ab8b71cca3a7d51efd
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-08-28 11:04:27 +00:00
hjk
afa6bb9dd8 Debugger: Make (sub-)registers editable
Change-Id: Ibca2808513b6784b65d5c7223717a8b1d930c381
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-08-28 11:04:12 +00:00
David Schulz
03be835b2d Cdb: Replace CdbCommand with DebuggerCommand.
Change-Id: Ie4d4d17c01d54cfdb5957138076a45bb7a9f5455
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-28 10:54:49 +00:00
David Schulz
2763704bee Cdb: Store pending commands in an Hash.
Use the command token as the key. Simplifies the CdbCommand,
because the command token doesn't need to be stored in the class.

Change-Id: Ic43ba16529db6e11ce00db1db49b384a627a4941
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-28 10:54:45 +00:00
David Schulz
d582b73a64 Cdb: Unify builtin and extension command queue.
Change-Id: I2dd85201cbab9095987be61146a16d516bfd114f
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-28 10:54:41 +00:00
David Schulz
845ee6a61d Cdb: Replace CdbResponse with DebuggerResponse.
Change-Id: I2fddd5904de665bc7e6731ee4be69639d82258a0
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-28 10:54:38 +00:00
David Schulz
be8290eefb Cdb: Simplify storing split cdb replies.
Change-Id: Ia50b9255c0da70b8c473349ab2a6b6f3d88e01ed
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-28 10:54:34 +00:00
Christian Kandeler
ed30c612f4 qbs build: Remove workarounds for fixed qbs bug.
That was most likely QBS-755.

Change-Id: I43d0316113fcca79554bfee9eee9b8bd706fce07
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-28 08:13:11 +00:00
Eike Ziller
6f2763144b Utils: Remove unused class
Change-Id: I854ef4697eaee451dbe75fb7e488a5cfeab1ed83
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-28 08:04:01 +00:00
hjk
156320ff6c Debugger: Merge QmlInspectorAdapter into QmlInspectorAgent
There's a 1:1 relation, and the abstraction is not needed anymore.

Also remove some unused code.

Change-Id: I09a2522deb5d522f46ec7518d19978a038032fbb
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-08-28 07:37:19 +00:00
Ulf Hermann
5c815dea19 Timeline: Avoid clip on TimeDisplay
The only thing that needs clipping are the thin vertical lines. We can
manually manage those with the "visible" property. Clipping with the
"clip" property on the parent element can cause costly rebatching for
the whole content while scrolling.

Change-Id: Ia31eeefc4c0a943b00ea47b12c5c9d49b0f004e3
Task-number: QTCREATORBUG-14983
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-28 07:35:19 +00:00
hjk
1eafa74b15 QmlDesigner: Remove some unused class declarations
Change-Id: I523e484bf1d071f6d09f68d481d61ec3f042e67f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-28 06:46:03 +00:00
Tobias Hunger
cdf87335f4 SVN: Fix encoding issues for commit message
According to

http://article.gmane.org/gmane.comp.version-control.subversion.user/118966

the encoding "UTF-8" should bypass any attempt of SVN to encode the
commit message, while "utf8" may or may not do so -- depending on iconv
settings.

Task-number: QTCREATORBUG-14965
Change-Id: Id7e8ed2c94c0b416bd02548fe31b55bc4256198a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-27 15:57:41 +00:00
Tobias Hunger
438c826859 CppClassWizard: Do not add signal/slot to non-QObject classes
Task-number: QTCREATORBUG-14959
Change-Id: I95920a8cb48facf086fbceae3e029bab30c23821
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-27 12:59:24 +00:00
Tobias Hunger
fdd5b0f1d1 QmlDesigner: Fix warnings about inconsistent override usage
Change-Id: I71de3d105c97940fe3b72adfbe3dbb898d7a7d2e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-27 12:13:30 +00:00
Tobias Hunger
c020d1e44b QmlPuppet: Fix warning about inconsistent override usage
Change-Id: I458a04b3045961ebeadb12a6c599cdcec79e1713
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-27 12:13:25 +00:00
Orgad Shaneh
7a7813b1b8 BareMetal: Do not add a duplicate entry for GDB server provider
In case the SDK settings contain some host which was imported, and the server
provider was modified to a different host, it is re-imported on next execution
of Creator.

Also fix a potential memory leak when registration fails.

Change-Id: I96d087ab35e0dc54975768c4bc697218080049ae
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-27 10:27:50 +00:00
Tobias Hunger
67d97be5ea Remove the designer templates
Those are no longer used. The templates are compiled into the shared designer library in Qt.

Change-Id: I4783151c81384d3f1c054a4e71678358b83edc0d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-08-27 09:53:47 +00:00
Tobias Hunger
8d9950ed40 Kit: Remove some unused code
Change-Id: I7f929466f9a4284127a301db3f38320934bcff20
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-27 09:53:01 +00:00
David Schulz
0aa4339353 Cdb: Remove the command from the response.
It was just used for diagnostic messages. The commands
can still be identified via the token in the messages.

Change-Id: If1c6f9e66bd65d9d3a16cb403d297c83b0c52d0e
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-27 08:12:27 +00:00
David Schulz
9e800bc0af Cdb: Pass the breakpoint id to the command handler.
This way the id doesn't have to be parsed from the command.

Change-Id: I8beb15c6d98a6628f373cf44b724dd4267efb728
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-27 08:12:22 +00:00
David Schulz
6633bc9927 Cdb: Remove command sequences.
Simplify the CdbResponse to become more like the DebuggerResponse.

Change-Id: Ifdd7c69e340b4c18c0e1187eb2173979feccd5b9
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-27 08:12:15 +00:00
David Schulz
6b2094b078 Cdb: Add Windows Kits 10 debugger path to cdb autodetection.
Change-Id: I7716faf9e5d480fe52ce9939d1f7093494d6d37a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-27 08:12:07 +00:00