Commit Graph

43408 Commits

Author SHA1 Message Date
Oswald Buddenhagen
100ea30a1a Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/projectexplorer/toolchainmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
2015-12-02 18:42:05 +01:00
Nikolai Kosjar
e4be9edc4d Clang: Reduce document annotations timer
Change-Id: If220ec7c84d41a47fc0f55dcbc55e62f0b7f05bd
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:45 +00:00
Nikolai Kosjar
475b11aad1 Clang: Fix recovering on clangbackend crash
The translation unit was updated, but not re-registered.

Handle the editor documents this way:
  1. Reset all ClangEditorDocumentProcessors (this will send an
     unregister message, but that's not problematic).
  2. For the visible editor documents, run their processors so that the
     translation units will be re-registered.
  3. For the invisible editor documents, mark them dirty. Once the user
     makes an invisible document visible again, the processor will run
     and also re-register the translation unit.

Change-Id: I23693ac197bd34a183f3a0020eb5372268636599
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:31 +00:00
Nikolai Kosjar
79d1d5b9e0 CppEditor: Reset process document timer back to 150ms
...since the clangbackend has its own timer now.

Change-Id: Icef3ea820da751617a3fe4b6f090ac244d0ddef8
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:25 +00:00
Marco Bubke
a08336fcc2 Clang: Don't send multiple completions for the same position
If we send already a completion we should test if there is already one
sent for the same position.

Change-Id: Ie88f89bff0e1da1c5e747827a45154c7ccaecabc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:01:54 +00:00
Nikolai Kosjar
03056a6d64 Clang: Make document annotations timer configurable
...by environment variable.

Change-Id: If20589e84dea2366fd9b6b273259ce29eddb965b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 15:56:18 +00:00
Tobias Hunger
f86ebcbf22 VcsBase: Add a button to reset VCS information cache
Task-number: QTCREATORBUG-14454
Change-Id: I958f58b8b19a8a9453e869daaf0a25ccf6fe57b3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-02 14:59:31 +00:00
Tobias Hunger
9894f6cf40 TargetSettingsPanelWidget: Use Qt5-style connects
* Use member data initialization as well

Change-Id: Ia8593b6f18dc6158edcdf4b96273cfbef5abfc44
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:41 +00:00
Tobias Hunger
723463e72c Id: Make versionedId QTC_ASSERT that there is a major version
There are no more users that use this without giving at least a
major version.

Change-Id: I4ed3c41eb87811435b9e354aa4b2ae8cc1979681
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:32 +00:00
Tobias Hunger
71b4ce6673 Qt: Remove platformName and platformDisplayName methods
Fix fallout of this in KitInformation/Kit/KitManager and the wizards.

Change-Id: I5cb88cc381dc04409401909b810940ab6dccf86a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:29 +00:00
Tobias Hunger
d323d595b7 QtVersion: Add a method to query the target device type
Add and implement a method to get the supported target device
types to the BaseQtVersion interface. Implement this for all
Qt versions.

Validate that the Qt version's target device type matches up
with the device type set in the kit and warn on mismatch.

Change-Id: I95da42031022663776afe23a50eae3677bdb1dda
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:25 +00:00
Tobias Hunger
eebe44d3cf Wizards: Turn "platform" into an Id
It used to be a string constant.

Change-Id: Ibea34dc52e97a483989e6d628b908231f4e2dc54
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:20 +00:00
Tobias Hunger
4b0a8648e4 FeatureProvider: Remove Feature and FeatureSet
Use Core::Id for Feature and QSet<Core::Id> for FeatureSet.

Change-Id: I12341036bd9eaa82589d92bd3f7d21f2e6b737bd
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:17 +00:00
Marco Bubke
f482ad6069 Clang: Use fontsettings in diagnostics
Change-Id: I8438293a37a53532927520106d4ee5346237ebfe
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 13:46:18 +00:00
Marco Bubke
ff913b83ae Clang: Use revision from file container
Change-Id: Ie084677fb910fc6e415afcdf7533369150162f8f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 13:46:10 +00:00
Finn Brudal
ea278cdf34 TextEditor: Fixes crash when double clicking virtual function proposal
Ensures that the DeferredDelete event is posted from the outermost
loop level.

Change-Id: Ib74d49d35811f35659ef272d6f0e0a4508f93076
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-02 13:18:16 +00:00
Marco Bubke
133b50ed13 Clang: Don't update the translation unit for changing the current editor
It is generating reparsing steps.

Change-Id: Ibbdb2f5dceffdf940bbdf0c9a9f0a706124078f9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 12:38:25 +00:00
Marco Bubke
493a2a6189 Clang: Fix slowness of code completion after opening the file
Task-number: QTCREATORBUG-15429
Change-Id: I9a8a582fb3c59a960425f83eb8e7b436f15d1c1a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 12:37:25 +00:00
Tobias Hunger
19ee414446 KitConfigWidgets: Use override
Use override on all virtual methods implemented by classes derived
from KitConfigWidget.

Change-Id: I050a9dbfd79b3ebe73af712b71d855a85f332928
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 09:46:56 +00:00
Ulf Hermann
a841dcebfc QmlProfiler: Deobfuscate connection mechanism
Whenever we create the connection we as well try connectToHost()
immediately instead of deferring it until the next timeout. The
else branch in tryToConnect() would never be executed because if
the connection is there and not connecting or connected, then
the socketState must be != ConnectedState.

Change-Id: I6736b35348671961fbb3a48edb5e9c6c1d7ce915
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-12-02 09:24:34 +00:00
Orgad Shaneh
48a2e15c28 TextEditor: Fix indentation of last line in selection
On normal selection it should *not* be indented.
On block selection it should.

Task-number: QTCREATORBUG-15300
Change-Id: I40ca1c24c6e14d05ca3c2d92a7562aac0eabb4c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-02 09:15:15 +00:00
Tim Jenssen
d5b8b9c951 readd changes at puppetcreator
Change-Id: I050a02fdfc2dde9048589e52b00353c1c0c25bd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-12-02 08:49:13 +00:00
Tobias Hunger
0d7f166b19 ToolChainManager: Filter duplicate toolchains more aggressively
Change-Id: I2a333cc54d3c77a1fd43001a94c212e36b2e5f39
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-02 08:32:07 +00:00
Leena Miettinen
1defeda8a3 Doc: link from Adding Connections to examples in another topic
Change-Id: I1bff533c217b75681e37a533e12df0fc2a9695c6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-01 14:44:55 +00:00
Robert Loehning
66e7b77d88 Squish: Update selection of code model
Change-Id: Iee76086dfd886dd8d61db3cfe4600a5eedd36cb7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-01 14:38:36 +00:00
Marco Bubke
a992a1064c Clang: Update document annotations only if document is visible
So no reparsing is happen for invisible files.

Change-Id: I8bf3fe8aed38b30ceeabc50ba2f216acc4b8b718
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-01 13:59:53 +00:00
Tobias Hunger
3a35d36b02 Core::Feature: Add some functionality currently implemented in Core::Feature
Convert a QSet<Id> to/from a stringlist and add the methods to create
versioned ids and id sets.

Most of the code goes into Core::Id, but the code to generate sets of
versioned ids moves into BaseQtVersion which is the only user.

Change-Id: Id52474fac2aa0563e48b2b714dcfef533350c729
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-01 13:09:36 +00:00
Jochen Becher
7b32b63707 ModelEditor: Use member initialization
Change-Id: Ib689bec4b12b3fb202bf54008ee06711f03c43c6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 13:08:45 +00:00
Jochen Becher
4334cec860 ModelEditor: Do not use member initializations in exported classes
Change-Id: I74a98fa4504f6a7dda7b3b8c4addb05118f37b00
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 13:08:36 +00:00
Jochen Becher
3f61e34bc8 ModelEditor: Use more explicit constructors
Change-Id: I67880be3f463ae8fb6bf3243114f90bd9bb78104
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 13:08:25 +00:00
Jochen Becher
701dd53fd3 ModelEditor: Use default constructor
Change-Id: I2b08e68eddbbf6bb589fd8f2ada77deabdcc6649
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 13:08:14 +00:00
Tobias Hunger
b977b2f4b1 Android: Fix AndroidDeviceInfo::isValid
Task-number: QTCREATORBUG-15430
Change-Id: I6746cffd8d3d4ffc71c35060ed0a2eba7a7aa64b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-12-01 13:05:08 +00:00
Marco Bubke
5f29a00c89 Clang: Change temporary directory for clangbackend
This is meant to

  1. Work around a libclang bug on Windows (not deleting preamble files)
  2. Delete left-over preamble files in case of a clangbackend crash

The temporary diretory will be removed on Qt Creator exit.

Task-number: QTCREATORBUG-10988
Change-Id: Ia5837c2a6ab2d55366d167dd591d87faaededf3e
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-01 12:24:55 +00:00
Nikolai Kosjar
a5a0864741 Clang: Fix warnings about unused members
Remove the unused members and remove also
ClangAssistProposalModel::[m_]replaceDotForArrow, which is a needled
indirection.

Change-Id: If6e0f65678b05fabd5fa16823a7a4c634b9fbdef
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-01 12:07:57 +00:00
Marco Bubke
d579608e8a Clang: Prioritize current and visible translation units
We reparse first the current and then the visible translation units before
we reparse all other units.

The signals connections are queued to wait for the visible editor update.

Change-Id: I5e2b8bc80568450268ca24e26720b3f5af640995
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-01 11:14:39 +00:00
Tom Deblauwe
e8503fa0a3 CMake: Add current run configurations' name to make step
This allows to conveniently only build the code you are
going to run. This is nice to use when you are developing
only a part of a bigger CMake project.

Change-Id: Ia430349fa655409f98620e86adaccb6e60044b4b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-01 11:13:16 +00:00
Tobias Hunger
db5bd69b26 Android: Add support for Android 6.0
Change-Id: Icd6a1904d7c1d6fecad3363d9cf72699e01db9f0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-12-01 10:40:39 +00:00
Christian Stenger
bfeb60ace5 VcsBase: Fix ClearCase plugin unit test
Change-Id: Icd1ff6a3e58a654babae4ebf3a4e33a26c4a58f4
(cherry picked from commit b3b3b41a7f)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-01 09:45:56 +00:00
Marco Bubke
8650954f0a Clang: Increase delayedDocumentAnnotationsTimerInterval to 3s
We experimented around and 3s are a good compromise.

Change-Id: Ib1d73738b221408c753c194b2122f82bae8d5eb2
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-30 16:54:53 +00:00
Nikolai Kosjar
a12a8c95f9 Clang: Request diagnostics/highlighting only if needed
Most of the time, the updated diagnostics/highlightings will be send by
the backend on translation unit update.

The other use case is changing the font settings (e.g. color), here we
need to request the highlightings explicitly.

Change-Id: I17a574eaf972c8bef12900241e7b33fe6ffd9dbd
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-30 16:50:49 +00:00
Jake Petroules
46b5eefcbf Explicitly document usage of Qt bug workaround.
Task-number: QTBUG-49694
Change-Id: I4516949af78320a1cdead9bce8ac90fe2ddc7fa9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-11-30 16:18:19 +00:00
Jochen Becher
8be94f73e5 ModelEditor: Add user defined virtual desctructors
Change-Id: I6655feacf6a6e9d92f58ae5926a470e3d0373ad5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-30 16:06:17 +00:00
Tobias Hunger
09102ddc7b MacroExpander: Add a way to generate a new UUID
Change-Id: I5c43419f717d84bd9954a4921eb6e6723d331646
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-30 15:49:25 +00:00
Marco Bubke
514a96c75f Clang: Don't reparse before code completion
Task-number: QTCREATORBUG-15365
Change-Id: I37f623449fa95268f1a0a5d5e66d75df0582c183
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-30 15:49:19 +00:00
Ulf Hermann
2186e42697 Debugger: Make sure there are no bools in Python code
Python doesn't like lowercase "true" or "false", so we have to
convert those to int before we send the command.

Change-Id: Id30ebbb0714cae23b030c78eec5e59378ac467bb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-30 14:15:19 +00:00
Eike Ziller
62e9d51c46 Macros: Add JS:Util.relativeFilePath(path, base)
Task-number: QTCREATORBUG-14562
Change-Id: Ib0c3ea442d7b2c92cedda7a5933ce73c64acc7e2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-30 12:20:47 +00:00
Tobias Hunger
7225f300dc Id: pack StringHolder class
Change-Id: If2c10725d60a0c2aaada515649bd33738e5d1de5
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-30 12:01:01 +00:00
Nikolai Kosjar
ed4bfff644 Clang: Rename "Editor Updates" to "Document Annotations"
"Editor Updates" are not to the point since what we generate is for the
document.

Change-Id: I94ceeca5c85c7cf01cc659ca55320d07010c8617
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-30 11:11:32 +00:00
Nikolai Kosjar
1410bf3faf Clang: Use "clang" prefix plugin files
...for consistency and to avoid future file name clashes.

Change-Id: If595c8debfa1ceb01a1bb0ed34649fa513660503
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-30 11:04:07 +00:00
Nikolai Kosjar
6a393afeda Clang: Remove unneeded CLANG_EXPORT
Change-Id: Ib05f97212758a4dd3f1abb7774f071c9385377b4
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-30 11:04:02 +00:00