Commit Graph

55733 Commits

Author SHA1 Message Date
Tobias Hunger
34b205ed22 ProjectExplorer: Fix some corner cases in signal subscriptions
Handle cases where targets/projects are removed and then added again.

This is currently not done anywhere, but there should not be nasty
surprises when somebody decides to do that later.

Change-Id: I47f9b4a1577f2021bcee87ccdd5435e3628b2a95
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-13 10:09:23 +00:00
Eike Ziller
9b43b55dc0 Merge remote-tracking branch 'origin/4.7'
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
2018-06-11 16:01:18 +02:00
Eike Ziller
4cba1d7c71 Merge remote-tracking branch 'origin/4.6' into 4.7
Change-Id: I5ffa9febea2ced10892a145aa0b930d45d84aea5
2018-06-11 14:31:54 +02:00
Orgad Shaneh
c62daf9cda CppTools: Do not use -isystem for header paths in the repository
Clang uses mmap for system headers. This locks the header files on Windows.

If the project file is not in the root directory of the repository, and it
uses header files that are outside its directory, but in the repository,
Git operations like checkout, rebase etc. can fail because the header files
are locked.

Change-Id: If8a258234479fc70ca0a8384bf24c68d767dbeaa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-11 11:38:10 +00:00
Christian Stenger
cab82a94c7 Clang: Fix accessing nullptr
Change-Id: I204ff9263520dee70a89adf99182d198e4dd1036
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-11 09:55:33 +00:00
Leena Miettinen
a9b0fa026f Android: Fix messages
Change-Id: If1af26c7c5762b14887787a30cd7dc37d44f9950
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-11 05:19:56 +00:00
Hannes Domani
168e89e0a2 CppTools: Fix memory leak of QFutureWatcher when canceled
Change-Id: Ia9cd428e3bed193167903b6ffa080e4886193789
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-08 15:48:21 +00:00
Christian Kandeler
22dfd2c3c8 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: If660a6c249cd9fb231f3cdd6df505426443bbbdb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-06-08 13:10:47 +00:00
Leena Miettinen
7a4da1fd63 Remote Linux: Fix capitalization of UI text
Change-Id: I1204bcba7748216bf5b0d5ba9853871b10821720
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-08 12:44:33 +00:00
Leena Miettinen
1067c2ed05 Core: Write MIME type in all caps in UI text
Change-Id: I8ba8448f3b38bd46353bb31d4e2c64e96827e997
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-06-08 12:44:12 +00:00
Leena Miettinen
b85905ca5f Projects: Fix capitalization in messages
Change-Id: I1928fe11a3a23c0577ecc941d259d310a211e86f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 12:43:57 +00:00
Leena Miettinen
791b81ab4f Qt Quick Designer: Write "file name" as two words
Change-Id: I153e625e8d3289630ecf46cf27dc0eb4acea8552
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-08 12:21:33 +00:00
Christian Stenger
aaf13b3c2b GlslEditor: Fix crash in function hint proposal
The function hint proposal gets filled with pointers
it does not own. It does not notice when these pointers
will get deleted or modified, but as long the
hint is displayed it tries to access them.
If the document gets modified and the gls parser tries
to update the document's AST these pointers might vanish.
Only use the needed information on the proposal's side
to avoid null pointer access.

Trade off: updating the proposal hint of declarations
           and definitions when document changes does
           not work on the fly

Task-number: QTCREATORBUG-20570
Change-Id: I20253e92e1ca9822b1fc1f327c5c5e16b4fd91be
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-08 10:52:24 +00:00
Robert Loehning
2d7d0abd2d Help: Make "System Information" a QDialog again
Making it a QWindow meant that Alt-Tab will lead to the main window and
right back to "System Information" because this is modal. This
incovenience outweighs the convenience of having a "Maximize" button.

This reverts a part of 40d7399755

Task-number: QTCREATORBUG-20513
Change-Id: Idcea54ee2f60f9f7efde7d25ce0c305b87f445dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-08 10:46:06 +00:00
Kimmo Linnavuo
5f9fa64d2b AutoTest: Export some classes
Change-Id: Ia7ae1879b99329f2d308f4264d133d8b64544243
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 10:07:31 +00:00
Christian Stenger
07ccefc1bd ModelEditor: Avoid accessing nullptr
When triggering the context menu on the navigation treeview and
having a model editor open QC might not find a node at all.

Task-number: QTCREATORBUG-20559
Change-Id: I71bc3e7c3f405460dd2af0a2b0cc7f1e6d3b68b6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 09:23:15 +00:00
Orgad Shaneh
21c9740089 Qmake: Expand user arguments when comparing them to the Makefile
If the user used a macro, the Makefile will never match it, and qmake will
be executed on each build.

Change-Id: I2790db3a788ea7971145b475781a6193a1ed0842
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 09:21:23 +00:00
Marco Benelli
50f536b9ae QmlJs: check markers before cleaning them
Task-number: QTCREATORBUG-20197
Change-Id: If4594a72abf4acf2455e55688679ba7f78900f76
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-08 09:02:21 +00:00
Leena Miettinen
35cc6789d2 Doc: Describe running and debugging tests from code editor
Change-Id: Ieb19c1ca62a7fa785c5ba6b90c4aebe40b124dee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 08:56:48 +00:00
Leena Miettinen
11e92fe789 Doc: Describe grouping Google tests by using GTest filters
Change-Id: I5f128de80ee8dc6ed0a2b42fd53834d041639113
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 08:31:37 +00:00
Nikolai Kosjar
7ff3846482 Clang: Remove unused class FollowSymbolData
Change-Id: If29f69f969127abcd9fdce5ff7647665c2717041
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-08 08:24:56 +00:00
Leena Miettinen
3b8f0842a0 Doc: Update information about compiling Qt Quick Applications
This is an open source feature since Qt 5.11.

Change-Id: I9f1554dc880c0f69c6488e3281f6ae9e7f533c65
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-08 07:10:09 +00:00
Eike Ziller
af59639826 App: centralize conversion from local8Bit
Change-Id: I8def56fa3b613ba32dad69a2997b190fa76cab3c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 06:49:14 +00:00
Eike Ziller
93d35399b5 App: Pull special command line parsing into separate function
Change-Id: I143aa3f49b3e9fb5a1aa30cf9c9364c61b95ced4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 06:48:22 +00:00
Nikolai Kosjar
cbd4d05423 Clang: Fix processing documents if multiple are opened at once
Reproducable with
 1. $ ./qtcreator a.cpp b.cpp
 2. Switch to a.cpp => no highlighting

Because ClangEditorDocumentProcessor does asynchronous processing, the
backend might receive a DocumentsOpenedMessage where the document is not
the current editor (happens for a.cpp in the example). When switching to
that document, the initial jobs were not processed as the document was
not dirty.

Address this case by also checking for documents that have a revision of
1 and are not dirty. Unify adding the annotations jobs to ensure that
not more than needed are run.

Change-Id: I14030260842f97d58280235e763c8d7490705f8d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-08 06:32:40 +00:00
Nikolai Kosjar
b30926cea4 Clang: Minor renaming
This completes

    commit f01fbcb789
    Clang: Clean up some IPC names

Change-Id: Ic747ca4a01e5c693bd59626eef516ae4a42bf9fc
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-08 06:32:33 +00:00
Robert Loehning
c91dde79d5 Squish: Update object for tst_HELP05
Change-Id: I0a38ed35061000591b8078ef534c2996809aeb58
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 05:29:20 +00:00
Nikolai Kosjar
e1e11ae15d Clang: Fix testCompleteFunctions()
With recent clang versions we can show default arguments properly.

Change-Id: I6028db183b0413650a32928d0051afb9402c5e32
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-07 13:46:08 +00:00
Leena Miettinen
59b3737065 Doc: Edit information about Clang Code Model and Tools
Change-Id: I8482e34ce056dd9b6a5a20a0a7a2c7603ea9a4b0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-07 10:52:53 +00:00
Jarek Kobus
d892eaadae DiffEditor: detect binary files
Task-number: QTCREATORBUG-15767
Change-Id: Ic9f513ecaeb15b56c90933b1d5e4cf70e045b481
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-07 06:57:31 +00:00
Leena Miettinen
b816992a39 Doc: Describe "Add linker library search paths to run environment"
A general option for disabling library linking generally for all
projects.

Task-number: QTCREATORBUG-20240
Change-Id: I9f7f53e6deae7079613be32dadcd1325e5579720
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-06 15:30:09 +00:00
Ivan Donchevskii
4f51b89d65 Clang: Do not duplicate operator entries
Do not show the same operator twice in symbol outline and
current document filter.

Extract common checks to TokenInfoContainer class.

Change-Id: I3b48aa949d678564c952a71f650b7ba601570fa2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-06 13:16:05 +00:00
Ivan Donchevskii
bb0c681ff8 Clang: Do not show any function internals in symbol outline
Treat everything inside function scope the same way
as local variables.

Change-Id: I038d84e5e90057d65a08afc742ebcdf2de55ff85
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-06 13:15:57 +00:00
Ulf Hermann
27907bc417 QmlProfiler: When retrying to connect, double the timeout
If you are retrying, then probably you want it to be more patient this
time. Also, tell the user how long we have waited and how long we are
going to wait when retrying.

In turn, reduce the number of "internal" retries. Retrying 10 times
should be enough to determine if the given timeout is too short. This
will give us an initial waiting time of 2s, and make the second try 4s.

Change-Id: Ibdfe02d041550eb16cadc59cec1b78ce97289b30
Task-number: QTCREATORBUG-20529
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-06 12:44:47 +00:00
Leena Miettinen
d3204ed5d4 Doc: Describe project type specific warning and error icons
... in the Projects view in the sidebar. Also, there is a big
Manage Kits button in the view now.

Change-Id: I3440fa34b98dba4c71a1c6a6559af31f7d9fd78c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-06 12:23:51 +00:00
Leena Miettinen
e824ef5e0f Doc: Describe zooming into QML Profiler flame graphs
Change-Id: I3662a6998c7defaf05cefaadd62c3d69f0d73083
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-06-06 08:28:32 +00:00
Eike Ziller
3f356f31bc Merge remote-tracking branch 'origin/4.7'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I3d42bd52fb7b977cfdfad83092fb6f6eac974e24
2018-06-06 09:57:01 +02:00
Eike Ziller
5921376573 Bump version to 4.7.0-rc1
Change-Id: I8be1dbdc726ec2b5520dbceb19973337afb71583
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-06 07:51:30 +00:00
Orgad Shaneh
97fadb5c7f CDB: Fix compilation
This amends commit f8e88e8ce4.

Change-Id: Iec2e553c1e63fa6e25301d04eba0c7ad42f14d66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-06 05:00:47 +00:00
hjk
0fbb2839f9 Remove ApplicationLauncher::Mode
The actual remaining use was to pop up a terminal in some
setups where Mode == Console, with a default of Gui meaning
"no console". In some downstream uses it was used set to
Console (probably to mean "this helper process does not need
a gui") but then luckily ignored when actually starting the
helper processes.

All cases where the console is useful and requested are
nowadays RunWorkers belonging to RunConfigurations with
a TerminalAspect, so they can directly get the relevant bit
from their RunConfiguration without having it part of
all StandardRunnables.

Change-Id: I1368d5968da5cf672656aebf200ccac8d45335d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-05 15:08:29 +00:00
Andre Hartmann
85ffe78e96 Utils: Properly name withNtfsPermissions()
Change-Id: I759e702b63f8bed9384ccbfae6345f858e50830b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-05 12:59:56 +00:00
Eike Ziller
f8e88e8ce4 Fix compilation issues with C++17
Testable on Linux/macOS by changing c++14 to c++1z in qtcreator.pri.
Testable with latest MSVC2017 by setting _CL_=/std:c++17.

unary_function, binary_function, and a few other things that were
deprecated are removed in C++17.
std::string got a non-const overload for its "data" member function,
so we cannot create a function pointer on it without specifying its
type. Use std::declval instead (though it requires a default constructor
for the type).

MSVC seems to have an issue with Utils::transform for std::vector
(used in Nim plugin), but that looks like a compiler issue.

Change-Id: I94f9a93d591d55b610f86fabfc618158927d6221
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-05 12:04:59 +00:00
Daniel Trevitz
d384e2398a Create Path
When the path listed in a PathChooser does not exist,
instead of showing actions on non-existent paths show
"Create Folder".

Task-number: QTCREATORBUG-20532
Change-Id: I98d149129ad33d7be36bfe13b2c1ab57ee193cf0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-05 11:57:19 +00:00
Ulf Hermann
8798990fb1 Doc: Add troubleshooting entry for globally disabled perf events
Change-Id: Ia37b26cc83566b1ae802471c17ef8d309a5d2fa1
Task-number: QTCREATORBUG-20154
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-06-05 11:41:53 +00:00
Nikolai Kosjar
5585d97522 ClangTools: Fix checking log file path
Change-Id: I3598ab0b0b512798417b8885f562ee7978b9cf3b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-05 10:36:43 +00:00
Nikolai Kosjar
c93515dde1 ClangTools: Remove outdated suffix for temporary file
Change-Id: I05b523f1c33462913a2f1fec986e74eab8120eda
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-05 10:36:32 +00:00
Nikolai Kosjar
bb6c02a443 ClangTools: Remove dead code
Change-Id: I5db111402902e81099489dc5ab4b0b929c574969
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-05 10:36:21 +00:00
Nikolai Kosjar
f19e28d95c ClangTools: Fix minor coding style issue
Change-Id: I18e36b82060923fb2271eb46298170c540fd943f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-05 10:36:10 +00:00
Nikolai Kosjar
b81e5cb3b2 ClangTools: Remove temporary dirs
...when a new run is triggered instead of on Qt Creator shutdown.

There is no reason to keep them around for longer than needed.

Change-Id: Ida7698843cc2f8822ffd662679cf5da2c4ece05c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-05 10:36:03 +00:00
Leena Miettinen
71f02417e7 Doc: Describe new file synchronization options
... in the Projects and File System views in the sidebar.

Change-Id: I38c77d8e5c19a1adb934c5b8d4777889467392c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-05 10:35:54 +00:00