Commit Graph

54723 Commits

Author SHA1 Message Date
Christian Kandeler
3ee2445fb1 SSH: Add support for ssh-agent
Task-number: QTCREATORBUG-16245
Change-Id: Ifd30c89d19e547d7657765790b7520e42b3741c3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-05-04 15:36:28 +00:00
hjk
fcdc9342b5 Debugger: Normalize some state handling
Remove some now-unusual connection to RunControl::finished
and use a finished() callback in the ToolRunner implementation
instead.

Change-Id: Ieddf05a2258d9a300ac50a739d77d9cfaee10ca6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-04 12:53:13 +00:00
Thomas Hartmann
cf3454d7fd QmlDesigner: Add flag to check for designer
The property runningInDesigner can be checked to find out
if a component is running in the designer.

Change-Id: Ibf35daba4bb30c7d919b1ff149c92b348d7e8059
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-04 12:34:32 +00:00
Christian Stenger
face7b13cd ProjectExplorer: Fix compile for Qt5.6
Change-Id: I259dd516a9b28e34a256321e8ac754f4215205a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-04 12:26:19 +00:00
Orgad Shaneh
b67f853650 Gerrit: Fix REST for Gerrit 2.14
2.14 sends JSON without leading closing parentheses.

Change-Id: I51ec44124e6c3f64b3a76733329fe3ea329c60b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-04 12:15:17 +00:00
Orgad Shaneh
83c8c9ad36 iOSTool: Fix stopGdbServer invocation
This amends commit 86882018dd.

Task-number: QTCREATORBUG-18108
Change-Id: I7c984e2f3596fb79a6027fe85c11577b3d1acf2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-04 11:55:52 +00:00
Nikolai Kosjar
0e5fdb7fe3 Clang: Tests: Clean up CompletionChunksToTextConverter
* Remove pointless declarations.
* Remove duplicated test.
* Fix whitespace.

Change-Id: I08102f8313b87dc87a44d96ff9c77205ccbb1a01
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-04 10:18:31 +00:00
Nikolai Kosjar
bc9afe3bbb Clang: Tests: Fix test names in ClangCompletionContextAnalyzer
Change-Id: I5a1b322957edb30cd4fe5a50deb50255da18cf8d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-04 10:18:24 +00:00
Thomas Hartmann
6d10a6f04e QmlDesigner: Improve Go To Component
This improves the signals present in "Go To Component"
or "Add Signal Handler".
For some controls we have to offer property changed signal
handler as first options.
We simply hard code properties which are likely to be handled.

Change-Id: Ide26589534d6d058f1b60afcc6353c4f0340cb22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-04 09:50:27 +00:00
Tobias Hunger
0a3409112b ProjectNodes: add listInProject() to Node
Add a setter/getter for listInProject to Node and make the project
list all nodes with this property set in Project::files.

Task-number: QTCREATORBUG-18132
Change-Id: I334e627856d1bc0d033e13c5d629f6657d8d7fee
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:56 +00:00
Tobias Hunger
b0f1aa98a8 ResourceTopLevelNode: Enable marking this node as generated
Change-Id: I298d405cd3f1a822949619beb6a0eae59dcfc143
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:47 +00:00
Tobias Hunger
4593092649 ProjectNodes: Move isGenerated from FileNode to Node
We have complex nodes like the ResourceTopLevelNode which can be generated.

Change-Id: Ifdbe72323b668961c50252f597a0bf67ec41f30b
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:42 +00:00
Tobias Hunger
cea68a3fe3 ProjectNodes: Use a set of flags for bools in Node
This has the potential to save some space per node.

Change-Id: I2b8b65c13b355e680965bb7307f9e8d8714dae64
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:36 +00:00
Tobias Hunger
175643fd7e ProjectNodes: Do not define a copy constructor for FileNode
Nodes are QObjects (still), so they should not have a copy constructor.

Change-Id: I1b20663ee0ec121cda4d39ced7a9f204fb4621a1
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:27 +00:00
Tobias Hunger
9ae5591956 Project: Skip duplicate files early
Change-Id: I9e2d8ce35c3f3901391c7494f1f3b60eee1bcd00
Reviewed-by: hjk <hjk@qt.io>
2017-05-04 09:16:15 +00:00
Tobias Hunger
1d160fb7d9 ProjectNodes: Fix forEachGenericNode
Iterate over all nodes in the whole tree, not just the FileNodes
of the children of the current node.

Change-Id: Ib8bf0eaecb2b13bd01dbc61417b83d0873ab6527
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-04 09:15:55 +00:00
Jarek Kobus
3261e73b0c Apply current filter to search results
QHelpSearchIndexReaderDefault is run in a separate thread
in order to return the results of the search. It reads
the info about the current filter in order to filter out
the results. However, the main thread didn't
store the current filter in the qhc file, just in memory,
and the search thread reads the value of the current filter
from qhc file, so this goes out of sync.

This patch stores the current filter in the qhc file
whenever it is changed.

The current code resets the current filter
by the launch of creator anyway.

Task-number: QTCREATORBUG-17845
Change-Id: I7c8d2c93b319c94e1400a677ecee9e9b41b029c3
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-04 09:06:13 +00:00
Eike Ziller
105b69836c Merge remote-tracking branch 'origin/4.3'
Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
2017-05-04 10:03:50 +02:00
hjk
ba5d12e80f Debugger: Move some commonly used flags to base DebuggerTool
Basically all derived tools will need access to the debugger aspect
data. Fetch it once.

Change-Id: I054e4255a036db258201a8a501af244206c06990
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-04 07:31:50 +00:00
hjk
20cacb4a8a ProjectExplorer: Add some ToolRunner convenience functions
Replicate parts of RunControl's read-only interface for
simpler user code.

Change-Id: Ic0f2efc0a7a0b96d26c5817f7fbc18b0c91a013b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-04 07:31:40 +00:00
Leena Miettinen
3b901b25a8 Doc: Describe changing QML type of item in Qt Quick Designer
You can now change the type of an item by double clicking
the Type field in the Properties pane.

Change-Id: Iacd70a595d693eb83d1b6d9fbfdf38429fd2706b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-04 06:44:19 +00:00
Leena Miettinen
66a22bb608 Doc: Describe the new toolbar in Qt Quick Designer
Some regularly used context-menu items can now be selected
on the toolbar. Some of the icons are constructed at runtime,
so images are needed for them. Some are in a new location that
has to be added to the configuration file.

Change-Id: Ibfc38ec21ed5526702abf89e64899efa5b978700
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-04 06:44:03 +00:00
Friedemann Kleint
1c25721ec0 qtcreatorcdbext: Fix build with MSVC2017
Fix error:
.\containers.cpp(616): error C2664: 'void RedBlackTreeNode::debug<void(__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int)>(std::ostream &,DebugFunction,unsigned int) const': cannot convert argument 1 from 'DebugPrint' to 'std::ostream &'
        with
        [
            DebugFunction=void (__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int)
        ]
.\containers.cpp(616): note: A non-const reference may only be bound to an lvalue

Change-Id: Ic4168fe8e3952c4c6b2bd6561f05c138094cb56e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-04 06:28:59 +00:00
Mitch Curtis
fcb504dede Flat Dark theme: make "changed variable" color in watch window readable
It was a dark red, which is really hard to read against a dark
background. This patch makes it a pastel red, as was done for the
Dark theme in bbb0de0553.

Change-Id: Ieb78522b1e5282e2c35b18ec65c31f4aeb246ad8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-03 14:10:49 +00:00
Tobias Hunger
b84aa8e837 ResourceNode: Set proper fileType based on file name
Set the fileType of ResourceFiles based on their file name. This
makes sure that QML files will be treated as QML, which fixes e.g.
QTCREATORBUG-18032 (and probably other strange bugs).

Task-number: QTCREATORBUG-18032
Change-Id: I05b1048d998ea1bed196611d529771c582bce441
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-05-03 12:28:04 +00:00
Tobias Hunger
ccdf335425 CMake: Fix possible nullptr dereference
Change-Id: Iadb62b671e115b2348dbe1d927212fd79a7fdf33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-03 11:53:01 +00:00
hjk
5d8d3fbdc7 ProjectExplorer: Extend centralized state handling
Add some customization hooks to make tools aware of target errors
and vice versa.

Change-Id: I4d815087297a3fa1d1d6d52daeed7c4ae0f624bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-03 11:48:23 +00:00
Nikolai Kosjar
3438b42719 CodeAssist: Fix use-after-free crash
...caused by

  commit fab4dd068e
  CodeAssist: Fix auto completion if function signature is shown

The crash occurs when e.g. typing "lib" in a *.pro file.

Ensure to remove duplicates before filtering, otherwise the duplicates
are removed afterwards and leave dangling pointers in the already
filtered items (GenericProposalModel::m_currentItems).

Change-Id: If6f027378beea2386d25389e366047a29513b553
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-03 10:36:35 +00:00
Christian Kandeler
db352bfc80 buildoutputparser: Adapt to removal of "slot" keyword
Was forgotten in 7b71ac3821.

Change-Id: I5f2d5dc17092d2761c8ba98df8e82fb644954833
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-02 15:11:38 +00:00
Robert Loehning
9ee0cec3bc Gerrit: Move line back to correct case
Change-Id: I7d6ee5835d67fce21ea211099d9d6aa6061517b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-02 14:41:28 +00:00
Thomas Hartmann
b07d26d43e QmlDesigner: Set the minimum width of navigator
We set the same minimum width the item library has.
This avoids overlapping icons, depending on the depth of the tree.
Since we are rewriting the tree view anyway this should be good
enough for now.

Task-number: QTCREATORBUG-18131
Change-Id: Id5f018c118499a8a47785282a25a29d40e0685b3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-02 12:45:20 +00:00
Eike Ziller
2d4adebf2a Fix that tool tips for long texts became too small
If the unwrapped tool tip is too long, we may not use the "preferred"
width of the label with word wrap on, because turning on word wrap makes
the preferred width very small. That would lead to tool tips with long
text becoming very small instead of "as large as possible but with word
wrap". Instead set the width to the largest that we deem desired, and
let the label word wrap on that.

As an example look at the tool tip on styleHint or setMask in tips.cpp

Change-Id: Id804b6ea4e4a872e65dd7f49eb3cd52553c04cfe
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-02 12:32:56 +00:00
Nikolai Kosjar
fab4dd068e CodeAssist: Fix auto completion if function signature is shown
This reverts

    commit 3bf19030ab.
    CodeAssist: Fragile proposals aren't closed by automatic proposals.

which fixed the case [1] but introduced the regression in case [2]. Re-
implement the fix for [1] in a different way: Check whether the new
proposal has any items to show before closing the function signature
hint.

Case [1]
  void f(int);
  void g()
  {
      f(bar // This is what we will have in the end. The steps are:
            // 1. Type "f("
            //    --> OK, function signature pop up is shown.
            // 2. Type "bar"
            //    --> OPS, function signature pop up is closed and no
            //        new completion list is shown because "bar" does
            //        not match any declarations.
  }

Case [2]
  int barman = 0;
  void f(int);
  void g()
  {
      f(bar // This is what we will have in the end. The steps are:
            // 1. Type "f("
            //    --> OK, function signature pop up is shown.
            // 2. Type "bar"
            //    --> OPS, no auto completion list for "barman" is
            //        proposed.
  }

Task-number: QTCREATORBUG-16934
Change-Id: I8456275d951de9e6fc53285a5dbcbd448d49ad08
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-02 11:07:48 +00:00
Vikas Pachdha
a4a78ae8b1 iOS: Fix run without deploy on iOS simulator
Task-number: QTCREATORBUG-18107
Change-Id: Ie847cdab672ff2df7af0c2fee742901de0783861
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-02 10:32:07 +00:00
Robert Loehning
f2e296f7c7 Tests: Add some lines to test editing of strings in debugger
Change-Id: I5178724e693db53ffcd99e3d17c3f6d18da0ef09
Reviewed-by: hjk <hjk@qt.io>
2017-05-02 10:31:48 +00:00
Robert Loehning
4ea64b902e Squish: Update tst_HELP02 to use QTCREATOR_DISPLAY_VERSION
Change-Id: I7cffa591f036ea7ff1803a49a605030612dd787b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 10:31:24 +00:00
hjk
1e9cc97220 Debugger: Improve handling of static members in shared objects
Change-Id: I4978094dc5dcd0e57bb6790cfc8476a9db77724d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 10:22:14 +00:00
Christian Kandeler
dacf13948e QbsProjectManager: Fix updating of run environment
When the build environment was changed, the run environment widget would
not update.

Change-Id: I8a318d86b5ac56ca9233cf4c694ca3c9f88870ed
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-02 10:08:44 +00:00
Eike Ziller
1b30990f24 Fix left sidebar width after switching modes
After switching to debug mode, hiding left sidebar, switching back to
edit, and showing left sidebar, the sidebar had very small width.

We may not calculate the splitter sizes for each placeholder
individually, because setting them on the splitter might distribute them
in a weird way when widgets are hidden. In the above example switching
back to edit mode while both sidebars are hidden triggered something
similar to the following updates:

Left side bar update:
- calculated: (300, 1000, 0)
- actual resulting: (0, 1000, 0)

Right side bar update:
- calculated: (0, 1000, 300)
- actual resulting: (100, 900, 0)

In the longer run it would probably be better handle the resizing in a
more centralized way, since now it sets the same sizes twice (once for
each side bar update).

Task-number: QTCREATORBUG-18009
Change-Id: Ife5d6f1caded55f444245f4c3c98ae05371363b8
Reviewed-by: Serhii Moroz <frost.asm@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-02 09:19:03 +00:00
Robert Loehning
8eacd5af69 Tests: Fix warning from MSVC2015
Change-Id: Icdf1ffa36ea76d9fb0e6c511924d3e014346776f
Reviewed-by: hjk <hjk@qt.io>
2017-05-02 09:15:32 +00:00
David Schulz
c3191f5922 Debugger: Adjust missing cdbextension message
The cdbextension isn't part of the binary artifacts repository anymore.
Adjust the message so the user knows that he has to build the
cdbextension in the matching bitness by himself.

Change-Id: I5a06edda62be8178fc64fb98468291d395598d74
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 09:10:09 +00:00
hjk
5955901f93 Debugger: Compile fix after e213585910
'prepared' got renamed to 'reportPrepared' in the mean time.

Change-Id: I2426e8ab156df642525d42feeedcd3692c7c8ac8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 09:02:57 +00:00
hjk
4f6293db8f Debugger: Make showPromptToStopDialog static
No need to depend on RunControl life time here.

The isRunning test is already done outside sufficiently often.

Change-Id: I3b33444df6092f52b186bbf3a58585ad0bbb03bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 08:56:40 +00:00
hjk
e213585910 Debugger: Move part of engine startup to preparation phase
Change-Id: I414c356cd615096ee68588b839aaf975657fb7f9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-05-02 08:49:58 +00:00
Eike Ziller
aeb0e0eda3 Increase timeout for update check
10 seconds are not enough for retrieving all the information from the
servers.

Change-Id: Ic1372a8b558f1c1f80ff6703b2d70ee92dd8652c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-05-02 07:59:50 +00:00
hjk
009865f8b3 ProjectExplorer: Use function calls for state signalling
Less opportunity for tool/target implementations to mess with the
RunControl state.

Change-Id: I2d179cd85c50efd2314bad9b1c2250ff6b16370e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 07:46:51 +00:00
hjk
d8bacfe9af Valgrind: Move to new target/tool split for local setups
Change-Id: I1167fdc147600c36149c13731d0680b858acf4fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 07:46:29 +00:00
Laurent Montel
cbe163584d Avoid some memory allocations
Change-Id: I6f3cba58307babd9e34be0c3f52e25b5f67b23e3
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-01 17:28:38 +00:00
Ulf Hermann
47b4a0811f Revert "Android: Improve application output window by adding filters"
This reverts commit d4ca232d54 and fixes
QML profiling on android.

Task-number: QTCREATORBUG-18120
Change-Id: I09b9062da197a4c6c0a7034f98a2bb0b41f1d559
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-28 14:43:47 +00:00
Tobias Hunger
7c8125b480 Qbs: Set displayName from rootProjectNode
Set the displayName of QbsProjects from the rootProjectNode if that
exists. This fixes the project name not updating based on the name
set inside the qbs files.

Extract that into a new method so that it can be used consistently.

Task-number: QTCREATORBUG-18100
Change-Id: I417264ee8843a9e0665bbc190f1dbc7869eed0e9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-28 14:17:18 +00:00