Commit Graph

44349 Commits

Author SHA1 Message Date
Eike Ziller
4026864f38 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/clangrefactoring/refactoringengine.cpp
	src/tools/clangrefactoringbackend/source/symbolfinder.cpp

Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
2016-11-16 16:04:59 +01:00
Tobias Hunger
6e17882bfc ProjectExplorer: Use Utils::FileName in ProjectImporter API
Change-Id: I60e05f1bd892b508db90bc48837e29e2725bf333
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-16 13:36:29 +00:00
Tobias Hunger
028b1170c9 TextEditor: Fix warnings about inconsitent use of override
Change-Id: I7fd388580dd133524616704a2108b683dd45499e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-16 13:35:53 +00:00
Przemyslaw Gorszkowski
6b2cf5cd03 FindInFiles: make possible to have more than one extension
This change adds a possibility to add more than
one external tool which can be used instead of internal finder.
Currently there is one extension: 'gitgrep'.
By default we use internal finder.

Change-Id: If644358552f3cea9ebda8308539322a1b6d3ab77
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-16 09:52:05 +00:00
Denis Klychkov
36d4d01cd3 Clang: Take precompiled headers into account when parsing source files
Task-number: QTCREATORBUG-15590
Change-Id: Icbfce4ffd6e9f9802641d35d898fa1dc1c4c18ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-11-16 09:10:14 +00:00
Christian Stenger
4ae07377db Tools: Disable clangrefactoringbackend again
The plugin is disabled and the backend causes compile issues
with older gcc.

Change-Id: I6c809d397872a77168ae4f51d01e9e4f5af3b64f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-16 09:00:16 +00:00
Nikolai Kosjar
569f4499c0 iOS: Fix build
Include <memory> for std::shared_ptr.

Change-Id: I549eef8e8dc42b58b07e3528d55193ed8c54dd7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 6614b7a276)
2016-11-16 08:51:05 +00:00
Vikas Pachdha
f28cefce8c iOS: Make iOS simulator usage asynchronous
Change-Id: I5770b372542690560680ef3208a284c7f0cf6670
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit aa355b4f70)
2016-11-16 08:50:45 +00:00
Nikolai Kosjar
6614b7a276 iOS: Fix build
Include <memory> for std::shared_ptr.

Change-Id: I549eef8e8dc42b58b07e3528d55193ed8c54dd7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-16 08:47:14 +00:00
hjk
80b2a4f1ba Debugger: Expose DebuggerKitInformation::ConfigurationErrors
... to allow more fine-grained decision making for kit choosers.

Change-Id: I9a4e97f7b4f4b074e1c764f6b134c15e2896dc79
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-16 08:37:35 +00:00
Jarek Kobus
6bdec50001 Fix string
Change-Id: Id540eb7b7e85618bffd7e44610df2e22748c494f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-16 07:13:28 +00:00
Vikas Pachdha
aa355b4f70 iOS: Make iOS simulator usage asynchronous
Change-Id: I5770b372542690560680ef3208a284c7f0cf6670
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-16 06:54:26 +00:00
Eike Ziller
3508a09010 Fix that files could not be dropped onto welcome screen
Needs to be implemented in Qt Quick itself nowadays.

Task-number: QTCREATORBUG-14194
Change-Id: I0456dc5d86c03672d8b6b8f9c45799851db1b059
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-11-16 06:50:53 +00:00
Tobias Hunger
c49a0dd502 CMake: Fix generator warning for server-mode cmake tools
Do not warn on wrong extra generators if cmake supports server-mode.

Make the massage point out the missing server-mode while at it.

Change-Id: I643c77fbebe4ba9a7ea6fee28422283118d145dd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-15 16:33:35 +00:00
Tobias Hunger
eff0768100 CMake: Fix server-mode trimming out targets every second time
Do not trim out targets every second time the project tree is generated.

Change-Id: I6ed9cd7bb6b2e88ec6dbe063f90719ffacffdd61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-15 16:27:21 +00:00
Tobias Hunger
7b467cbad6 CMake: Make sure paths are clean in server-mode
Change-Id: I93c61a24e63d8920731b4197d88248d13219eb81
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-15 16:27:09 +00:00
Alessandro Portale
231fc628e0 Utils: Add an Icon::combinedIcon convenience override
...which takes a list of Utils::Icon. This will be used more often
in upcoming changes.

Change-Id: Id5ba1616c6ad393b1603043980ad7ec8315738d2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-15 15:42:56 +00:00
Eike Ziller
45216d5c1a macOS: Fix that some actions still had icon in menu
For example when toolbars showed a menu for actions that no longer fit
(e.g. open diff viewer, reduce window size until the synchronize and
switch view buttons vanish).

Use the application flag to disable icons in menus on macOS globally
instead of doing that individually on the actions.

Change-Id: I3b682f48ee0e866f0f0d5bb0834690937f427d7f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-15 15:42:35 +00:00
Tim Jenssen
9c7ff5199f Clang: Add clang query
Clang query is mechanism to use AST matcher to search for code. Think
about regular expression but in the context of AST. So you get a semantic
search tool for C++.

Change-Id: I72e882c5b53a0c52f352a3664847c4c3e4f6fc2e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-15 15:30:33 +00:00
Jarek Kobus
96187594b5 Fix error messages
Change-Id: I88b72925c15e7bc70106cf5f8d9c21f558f8c918
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-15 15:14:31 +00:00
Eike Ziller
37076e8c33 Reduce thread priority for test parsing
Adding API for that to the parallel map/reduce functions

Change-Id: Ic7987d899c124dcb04c1ca110b09fc97576873fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-15 15:00:18 +00:00
Thomas Hartmann
cedf7a012e QmlDesigner: Adding try catch block
Change-Id: I4956b58f1ffd3bfdf0e6b810de1f411ae7d7f8a0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-15 14:08:52 +00:00
hjk
757153fce5 ProjectExplorer: Don't show context menu when it makes no sense
Task-number: QTCREATORBUG-17152
Change-Id: Ic67386bdfd6d6d79e8a15bc6394a22cb46305335
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-15 13:25:09 +00:00
Eike Ziller
fc69e4ef54 Fix that it was not possible to save with arbitrary file extension
On Windows.

Task-number: QTCREATORBUG-15862
Change-Id: I5cc76662e4996bfa26eece09f2e30dc3ce873eb5
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-15 11:39:12 +00:00
Nikolai Kosjar
745fc30277 CppEditor: Fix null pointer access
Task-number: QTCREATORBUG-17253
Change-Id: Ide3d15508a2e310c307fef68457848e869c4d2de
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-15 11:21:25 +00:00
Tobias Hunger
53d45de8a0 CMake: Allow to build target from context menu of CMakeTargetNodes
Change-Id: I0457abd6dabea1699272482eb5f7fbb3ca097310
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-15 09:30:59 +00:00
Nikolai Kosjar
fd1d10987c Clang: Require LLVM >= 3.9.0
We already ship with a cherry-picked change from version 3.9.

Change-Id: Iad09ac8db470506c5de0321f3a2346c549b11b31
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-15 08:46:46 +00:00
Nikolai Kosjar
bf0c4e7c2b ClangStaticAnalyzer: Raise supported clang version to 3.9.0
Change-Id: Ic8eb8c7b25f1b2b6bdb6b645816342748b181bd0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-15 08:46:40 +00:00
Nikolai Kosjar
8594020b57 CppTools: Fix crash on document close
Emit the signal only if we are not canceled.

Task-number: QTCREATORBUG-17249
Change-Id: I5082a5fe7554eecdc7ec5d148150c1b169002f6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-15 08:41:05 +00:00
hjk
e265c5403b Debugger: Merge two variants to set detach-on-fork
Change-Id: I8459110b2729c0ee8c797f184c018fdb44cafe45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-15 08:26:18 +00:00
hjk
0df4c0bd5f Debugger: Remove some unused and forgotten function
Change-Id: Ic9d0e609dbc41aeed292f3d069ebfc0c6ef324ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-15 08:26:02 +00:00
Tobias Hunger
6fe3d3bde9 Git: Only show note about perl if perl is not found in PATH
Task-number: QTCREATORBUG-17154
Change-Id: I4602084204a3b26ead8d4e3e8108d6d4642c829a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-14 22:47:46 +00:00
Christian Stenger
a4e213b775 ProjectExplorer: Avoid accessing nullptr for unconfigured projects
Task-number: QTCREATORBUG-17256
Change-Id: I586c7267cbb4f9f16134c1be08aa4a738e990e80
Reviewed-by: hjk <hjk@qt.io>
2016-11-14 13:31:47 +00:00
Tobias Hunger
e37539a16c CMake: TeaLeafReader: Simplify code
Change-Id: Ib615fde89952848c4cfe392a2e84c15f6b73de80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 12:30:43 +00:00
Tobias Hunger
ff68d4cab1 CMake: TeaLeafReader: Fix include path detection
Change-Id: Ifcd64836aef7fc69b3cc0d4c27a07293348b91a6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 12:30:39 +00:00
Christian Kandeler
bc6f90cb2a Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: I311ae7c1e1523bdda86efd3c92149261f8d69129
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-11-14 12:16:50 +00:00
Jake Petroules
e50c9afce9 Qbs: filter out -arch compiler flags from platformCompiler/LinkerFlags
-arch is not allowed in compiler flags as it's automatically handled by
the qbs.architecture property, and is an error in current versions of
Qbs. If the architecture was successfully detected, remove the flags.

Change-Id: I85cce7b7f4ef5a92f857ec624a912861bcb267f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-14 12:02:06 +00:00
Tobias Hunger
247a6fea93 CMake: Server-mode: Use sourceDirectory directly
Change-Id: I0929ea86e24a8f1aa4dbfc5d41421127accefe33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 11:17:45 +00:00
Maurice Kalinowski
3c80389796 winrt: Remove experimental flag
The plugin is in use since many years and can be considered stable these
days.

Change-Id: Ia41b24849abd16e15313ab97f82d277673b3904b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-14 11:14:24 +00:00
Kai Koehne
e5becbdfb9 Replace WIN32 define with _WIN32
Only MinGW gcc defines WIN32, MSVC compiler does not. It's
also defined by qmake (msvc-desktop.conf), but not by qbs ...

Let's just use _WIN32, that's defined everywhere.

Change-Id: I8342a70498be54a965dcf7fae63eaf406aaa3c04
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 10:36:31 +00:00
Tobias Hunger
b7f15d8cdf CMake: Do not crash when restarting a filesystem scan
Change-Id: I7a86169f4dd891c91295a7d6daadfd2bac8db751
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 10:29:59 +00:00
Tobias Hunger
4b4dc9d06c CMake: Project tree for server mode data
Change-Id: Ief884a76c1b4211501dd6515b17b6e88a8e881e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 10:29:53 +00:00
Tobias Hunger
38f30e733f CMake: Always show CMakeLists.txt in project tree
Always show the top level CMakeLists.txt file in the project tree,
even when parsing failed.

Change-Id: I42c844eb54b32fcb51131ad63a8fc372622636fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 10:29:30 +00:00
Christian Stenger
b892d82086 QbsProjectManager: Fix compile with gcc 4.8
Change-Id: I3be0349c9af1f8ed51f04c04ce97983409dd7512
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-14 10:10:54 +00:00
Alessandro Portale
6d7bb54e77 AutoTest: Use themed test result icons
Task-number: QTCREATORBUG-16663
Change-Id: I087024bf2882690233032e555a825e397c945d3e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-14 10:03:46 +00:00
Christian Stenger
f967545c5a AutoTest: Fix handling of enabled state for code parser
Avoid unintentional re-enabling of the code parser.
Handling of the enabled state broke several times before,
therefore separate it from other states of the parser to
avoid breaking it again when not taking enough care while
refactoring or adding features related to states.

Change-Id: If1eb0dd649225f10bfc3bf06f09851649da75983
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-14 09:57:25 +00:00
Orgad Shaneh
9c09ca9e42 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
2016-11-14 11:17:13 +02:00
Tobias Hunger
1a2f649b70 CMake: Clean out unnecessary data in server mode reader
Do not keep data around once it is used. It will not help on the next run,
especially not when the parsing fails then:-)

Change-Id: Ifa1259b74349ac172a5c9d5411c10d429085b853
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 09:03:44 +00:00
Tobias Hunger
ae46c06ac6 CMake: Show scanned header files in project tree (TeaLeafReader)
Change-Id: I06ed341a603f4062b41eabc91a90d6d8041aaa4b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-14 09:03:37 +00:00
Eike Ziller
b5f587efb5 Fix that save as from "file was removed" dialog didn't provide filters
Also removes some code duplication.

Change-Id: I4f4616717f2eb37a1c73accdfa81e6d0dae6809f
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-14 09:03:29 +00:00