Commit Graph

54723 Commits

Author SHA1 Message Date
Eike Ziller
6e8ee7479e Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
2017-05-09 15:07:30 +02:00
Ulf Hermann
d571e8d442 RunConfiguration: Don't call virtual methods by pointer to base method
Change-Id: Idcd939eff52a9d00addada8ddba0513619b1d432
Reviewed-by: hjk <hjk@qt.io>
2017-05-09 13:00:08 +00:00
Vikas Pachdha
3282f85f3d Update the application output tab's title
Output tab might be reused but title nevertheless be updated

Task-number: QTCREATORBUG-18109
Change-Id: I497fa3086e840131fbfcc81a5002da06ac70978f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-09 11:55:31 +00:00
Orgad Shaneh
3fe9765073 ProjectExplorer: List sub-project (like pri) files in the locator
Change-Id: Ic501ba0af8bba4589cba62d78f0ef62cd5f5d46f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-09 11:43:00 +00:00
Leena Miettinen
62b855c518 Doc: Update screenshots
To have all screenshots in the topic use Windows 10 and the
new green numbers.

Change-Id: I111d95191365e6d40c093910dc99cba4d9c16b7e
Reviewed-by: Niels Weber <niels.weber@qt.io>
2017-05-09 11:38:00 +00:00
Ulf Hermann
a6c3b57677 QmlProfiler: Fix flame graph context menu test
The context menu event can be generated multiple times within one loop
of QTRY_VERIFY. The result is that multiple showFullRange() signals can
be generated before we check again for spy.count() == 1. Thus, the check
never succeeds and the number of signals keeps growing.

We connect the showFullRange() signal to the model manager in order to
get a more realistic test setup. This way the action that generates the
showFullRange() signal is disabled in any further context menus, just as
it is supposed to be. In addition we can now check for the manager to
actually show the full range.

Change-Id: I5e13c2666ce1a15c7a5fad57affd4274d9656656
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-09 11:34:00 +00:00
Leena Miettinen
5f085ea87a Doc: Describe the experimental Clang Refactoring plugin
Change-Id: Iad1baf49ae1ad0fde83fdcbdb6c02087af52131a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-09 11:29:47 +00:00
Leena Miettinen
a17d4f9a5e Doc: Add info about modifying properties for states
Update screenshots.

Change-Id: I6be8a9a844f6c822650fa817756987a43abbd993
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-09 11:13:54 +00:00
Leena Miettinen
87276046be Doc: Describe editing the when condition of states
...in the Qt Quick Designer States pane.

Change-Id: Ie2a2252d295d6d0ae37744b7cc7691d5a1c3022f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-09 11:10:43 +00:00
Tobias Hunger
56414c0cc9 Clean up after qmake
Remove dummy files that qmake litters into the project tree.

Task-number: QTCREATORBUG-17675
Change-Id: I74ec4443e76b40eaeae2c746d25c38b4acf9e92b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-09 09:55:10 +00:00
Leena Miettinen
92918158e1 Doc: Add a link to the Qt Quick Controls 2 - Contact List example
...to the section that describes using the QML_DESIGNER_IMPORT_PATH
option in a project .pro file.

Change-Id: Ia8b10481b4235a89dae6d8df2b0320efb88ed1dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-09 08:34:41 +00:00
Orgad Shaneh
11dd4ab75c Debugger: Fix swapped object/original addresses
Task-number: QTCREATORBUG-17938
Change-Id: I71773893c2dde784c5d3f4c63e7efbbdad13916c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-09 08:28:12 +00:00
Vikas Pachdha
5009bafea2 Android: Fix C++ debugging
Target Async mode enabled only for ndk version > 11

Task-number: QTCREATORBUG-18111
Change-Id: I218b6c23c1da13091f0035193a43e6117748055a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.3.0-rc1
2017-05-08 15:13:29 +00:00
Christian Kandeler
63e395c876 QbsProjectManager: Fix object files appearing in locator
This bug got re-introduced by commit fc5ce1e710.

Task-number: QTCREATORBUG-17382
Change-Id: I6114ca8f4305b3c0e356f4849094ecb1ccca7601
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-08 12:55:39 +00:00
Tobias Hunger
d056df2c15 ProjectNodes: Fix crash in FolderNode::addFileFilter()
Task-number: QTCREATORBUG-18160
Change-Id: I1b8fe9f949ca9aa04858321317ebb13eb01236ab
Reviewed-by: hjk <hjk@qt.io>
2017-05-08 12:54:12 +00:00
Robert Loehning
9bb80c0e80 Squish: Increase timeout for cloning in tst_git_clone
Change-Id: Ib894ae05e8049331115ee34514d7638815408065
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-08 11:41:47 +00:00
hjk
314f77fae4 ClangStaticAnalyzer: Move closer to new target/tool split
The ClangStaticAnalyzer is a tool.

Change-Id: I1462997a99e49486b47accb302d3f5b7b0b672b6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-08 10:02:35 +00:00
hjk
5b720923c2 ProjectExplorer: Remove wrong QTC_CHECK
Tools like ClangStaticAnalyzer do not operate on a running process,
so there is no valid process handle when they are 'stopping'.

Change-Id: I42754475f9c7c7367e0f4875c6f3348fd81fccf8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-08 09:24:15 +00:00
Robert Loehning
d10b9390c8 Squish: Update tst_git_local
Format of .pro file changed slightly

Change-Id: I026057ecc76c082ddac06e81b36c0b3b62629da0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-08 09:15:27 +00:00
Eike Ziller
ecbe001f2e Get rid of special "EndOfBlock" format in python highlighter
Change-Id: Ie02d3ae02b2453b33a3c779307f6f44348e2d0cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-08 08:49:49 +00:00
Eike Ziller
fca108c35d Remove dead code from GLSL highlighter
Change-Id: I43734e16ee0972906666629dc822e19982980d0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-08 08:49:42 +00:00
Thomas Hartmann
079e6cb8bb QmlDesigner: Fix ugly paint glitch
The text inline editing has an ugly cursor rendering glitch
with Qt 5.8.
When we render the widget "manually" using grab then things seem to be ok.

Change-Id: Idd00044de783164ca4ec021ae4c7b9f15302c2cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-08 08:29:35 +00:00
Leena Miettinen
82d928d189 Doc: Describe Move Component Into Separate File dialog
This refactoring action can now be performed from the Form Editor
of Qt Quick Designer. It opens a dialog for specifying which
properties should be set in the original component and which in the
new one.

Change-Id: Ic076ddc2748a5da38c746b64eac943ec5adbbbf5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-08 08:16:14 +00:00
Leena Miettinen
f412a9b2e2 Doc: Add a link to the Qt Quick Controls 2 - Flat Style example
Change-Id: I3e38759dddb83202d14e40d2392a3e796c799bfa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-08 08:16:00 +00:00
Orgad Shaneh
279192f17a Dumpers: Fix operator + for pointers
Add an extensive unit test to prevent future regression.

Change-Id: I38b74f9b4f5893285e9afff2ddecaaad106f4114
Reviewed-by: hjk <hjk@qt.io>
2017-05-08 06:58:48 +00:00
David Schulz
a4bc6e8ee6 Debugger: Instruct user to enable CDB support component
If the cdbextension can't be found in 4.3 it's most probably caused by
an update of Qt Creator via Maintenance Tool. Instruct the user to
enable the 'Qt Creator CDB Debugger Support' component via the missing
cdbbextension message box.

Change-Id: I1e71d89ca75049dc1a2aacbe2b17bebf910a0d91
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-08 06:55:46 +00:00
Vikas Pachdha
436a10ce50 Android: Fix AVD creation
Task-number: QTCREATORBUG-18161
Change-Id: Ibe7f779d26c199a91634c5921556df67d7c5aada
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-05 12:25:48 +00:00
Nikolai Kosjar
51996e9afe Clang: Rename parameter
Change-Id: Id509e798c6b421f27ee46d7e84012225601dde30
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 12:11:07 +00:00
Nikolai Kosjar
c1d7f4091e Clang: Rename/remove projectPartId
Change-Id: I91e95acd37152eda4e25c0b8abf46d36523fd2b9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 12:11:01 +00:00
Nikolai Kosjar
cf0e3f2db3 Clang: Fix updating supportive translation unit
...with new project arguments.

Reproduce with:
 1. Open a file with some #ifdef
 2. Edit the file, e.g. type space.
 3. Change the build configuration so that the highlighting flips in the
    editor.
 4. Edit the file again, the configuration flips again [repeat].

Change-Id: Ib97c18fc46538d74c63972e682a348ae2736a4e6
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 12:10:56 +00:00
Nikolai Kosjar
fda21898fb Clang: Simplify triggering initialization of supportive translation unit
Use a flag to indicate whether a supportive translation unit should be
set up. It will be needed in a follow-up change, too.

Change-Id: I6858caa303fcd9dca9486607380240dd5895a14a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 12:10:50 +00:00
Thomas Hartmann
42ad06ee32 QmlDesigner: Use proper meta info for Item
The QML minor version does not always match the
QtQuick.Item minor version. The wrong version
leads to warnings/error messages later.

Change-Id: I5d38c17da079d8309db4fd4044eb0be4e9093dae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-05 12:09:31 +00:00
Tobias Hunger
ec0ff0cf7c qmake: Make resource file contents available again
The Qml code model needs the contents of resource files. This was done using
QmakeVfs::readVirtualFile, which is not correct, since it does not read data
from files on disk. So fix this mistake by using QmakeVfs::readFile instead.

Task-number: QTCREATORBUG-18140
Change-Id: I25fd07d63ab02764bdf3fa705e2ff025d6831581
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-05-05 12:06:26 +00:00
hjk
2a46b1521d ProjectExplorer/Debugger/RL: Make run control state transitions more uniform
Forward all tool and target activities to run control, and initiate
further state transitions (only) from there. Also, make sure
tool/target's on finished() triggered on all finishing code paths.

After that, the base state handling is sufficient to handle remote linux
running and debugging.

Change-Id: I0150ef249c9ad0b7b8ac7192be6dc860c9ca8fc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-05-05 11:17:49 +00:00
Christian Kandeler
ae1ae27be3 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: Iade1952749f9f6344d2a535a106c63282bfc5041
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-05 11:07:52 +00:00
Tobias Hunger
e71fc39885 Abi: Make MSVC2015 match MSVC2017
Task-number: QTCREATORBUG-17740
Change-Id: I846f2a6a3c9819975c5ded2a447f8a38a098aa6b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-05 11:00:48 +00:00
Nikolai Kosjar
ac59e2be40 Clang: Move createJobRequest into Jobs
This simplifies the high level client ClangCodeModelServer and removes
quite some duplication in tests.

Change-Id: I4c6ab8646c8728990ebaca2b920ae514e949c54a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 10:39:39 +00:00
Nikolai Kosjar
b091b20685 Clang: Clean up TranslationUnits
* Use shared pointer to simplify ownership, also for a follow-up change.
* Remove pointless else-if
* Rename some variables

Change-Id: I6a9c5760c3812e071e9199228502c87b6944926a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 10:39:32 +00:00
Orgad Shaneh
d4ac34449b PathChooser: Expand ~ to home directory
Change-Id: I4d767b6978f69c0e0a8dbfb3ccd6fc5b33fc3984
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-05 09:49:02 +00:00
Leena Miettinen
872598747f Doc: Update info about Qt Quick Controls 2 support and styling
Replace duplicate information in the "Creating Screens" topic with a
link that poinst to the new "Using Qt Quick Controls" section in the
"Creating Components" topic.

Add information about selecting styles on the toolbar.

Change-Id: I6c79b8781c216355427920a38542017f0dbf9929
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-05 09:48:23 +00:00
Tobias Hunger
76e9100a66 Wizards: Update Qml-related wizards with documented QRC file syntax
Task-number: QTCREATORBUG-18149
Change-Id: Ic63e3c35bb6c52dfa6d3b10c32e0c49077618656
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-05-05 08:50:58 +00:00
Christian Kandeler
71c5080d15 SSH: Fix DSA key creation
We forgot to fill the key size combo box for this type of key.

Change-Id: I30cb1a7996d03c5eb139aa65f43810e1014472c7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-05-05 08:22:23 +00:00
Christian Kandeler
3691fbb8f8 SSH: Catch std::exception rather than Botan-specific ones
In particular, the existence of Botan::Exception wrongly suggests that
it is the parent class of all Botan-specific exceptions. This
assumption, combined with a different bug that will be fixed in a
follow-up commit, caused a crash in the key generator.

Change-Id: I0aafb761052d185051df217c9914010235a7c77b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-05-05 08:22:01 +00:00
Nikolai Kosjar
b9c76d5218 Clang: Rename reparseNeeded to isDirty
...because the flag can be set for needed parses, too.

Change-Id: I8b328afefb282cb6bd1cf88711af3d08a56808db
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 08:18:08 +00:00
Nikolai Kosjar
e811ac4bfe Clang: Use class enum in Document
Change-Id: I754eaf185d10b61db5bd5f622d1912c53f71e79b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 08:17:58 +00:00
Thomas Hartmann
30f3fbdd17 Fix warning
Change-Id: Ia5080bcd9d70f8d588ae69685bfb0f8110755abf
Reviewed-by: hjk <hjk@qt.io>
2017-05-05 07:14:50 +00:00
David Schulz
7e38b54525 Highlighter: Fix freezing highlighter for complex context switches
Exclamation marks in context attributes are used to split the attribute
into a number of orders and an identifier. This identifier is the
context that have to be set after executing the orders. Ignoring this
context identifier could lead to an endless loop if used inside a
default context with a Rule that has set the lookAhead attribute.

Task-number: QTCREATORBUG-14611
Change-Id: I5992fa47ed2e353cbf7882bc772fdbee8f7f41f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-05 05:58:26 +00:00
David Schulz
7fb81d94f4 Debugger: Fix missing 'typename' prior to dependent typename
Task-number: QTCREATORBUG-18142
Change-Id: I4545526c83f184c8b76a9aad928c91c36d34b6e3
Reviewed-by: hjk <hjk@qt.io>
2017-05-05 05:25:59 +00:00
David Schulz
024858ff9d Debugger: Remove 'available' part of the cdb python setting
Since the cdbextension is now shipped with python the majority of users
should have this extension.

Change-Id: Iea8802ccd118ea421767f41666d03c59e7027e03
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-05 05:21:56 +00:00
Christian Kandeler
28d9c49e9b buildoutputparser: Install dummy theme
ProjectExplorer::Task needs a theme these days

Task-number: QTCREATORBUG-16335
Change-Id: I266d676ee1a17bacb32d5f014436a81cddd5dde9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-05-04 16:06:32 +00:00