Commit Graph

53197 Commits

Author SHA1 Message Date
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
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