Commit Graph

44349 Commits

Author SHA1 Message Date
David Schulz
e19e9a1e90 ProjectExplorer: Fix msvc toolchain detection
Change-Id: I829753f4db9d3278a523f3c5c50b3296a5b11f3d
Reviewed-by: hjk <hjk@qt.io>
2018-02-20 10:22:24 +00:00
Ivan Donchevskii
413c66ec88 C++: Fix crash on '{' press
Introduced by 0629400.
Sometimes typing '{' after class crashes QtC.

Task-number: QTCREATORBUG-19726
Change-Id: Idbbfaaa21837ec4afbe7debbd80ddaa484120f09
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-20 08:27:31 +00:00
Eike Ziller
36c88ba5fb Fix Utils::withNTFSPermissions with void function
Fix up of 9467ed42c3

Change-Id: I24343e5e1440210188742332ec6f725af3412100
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-02-20 08:26:03 +00:00
hjk
38acd39f3a ProjectExplorer: Fix object creation order
95deefb5a revealed some initialization order requirements:
AppOutputPane needs SessionManager,
CurrentProjectFilter needs ProjectTree

Change-Id: Ibd3d14a7d23f55a850db43e031e68c32059e6e6a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-20 07:46:09 +00:00
Eike Ziller
23ab27ac04 Remove funny, commented code
Change-Id: Id7203efe0c131ac049b3d238d674db1fede40c52
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-20 07:34:29 +00:00
Ivan Donchevskii
66c7629814 Clang: Properly handle Q_PROPERTY in TokenInfo
Transform Q_PROPERTY into unique AST node.
Mark different parts with types and search for parent
in FullTokenInfos.

Change-Id: Iaa1ec0c73d34773edf5605d3682bd6a290d195de
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-20 06:49:47 +00:00
Thiago Macieira
b5f63a76b2 Fix build: add missing #include for QmlProfilerSettings
qglobalstatic.h:87:18: error: field ?value? has incomplete type ?QmlProfiler::Internal::{anonymous}::Q_QGS_qmlProfilerGlobalSettings::Type {aka QmlProfiler::Internal::QmlProfilerSettings}?
qglobalstatic.h:152:9: note: in expansion of macro ?Q_GLOBAL_STATIC_INTERNAL?
qglobalstatic.h:159:5: note: in expansion of macro ?Q_GLOBAL_STATIC_WITH_ARGS?
qmlprofilerplugin.cpp:79:1: note: in expansion of macro ?Q_GLOBAL_STATIC?

Change-Id: I940917d6763842499b18fffd1514e0f3522f3bbd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-02-20 06:16:35 +00:00
Thomas Hartmann
436b8cdea1 QmlDesigner: Use Core::ICore::dialogParent() for dialog
Change-Id: Ie06e8632ff091ee6cc14dacf242461ceca4eaf9c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-19 17:26:05 +00:00
Ulf Hermann
41017d1bbd QmlProfiler: Use a predictable kit in the QmlProfilerTool test
We may not have a valid kit at all, and then the test would fail.

Change-Id: Ie2613e67309121f0df847e76668bc433fd88c315
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-19 17:03:11 +00:00
Ulf Hermann
38064c97b0 QmlProfiler: Prevent kits without device in the attach dialog
We QTC_ASSERT on the chosen kit having a device in
QmlProfilerTool::attachToWaitingApplication().

Change-Id: I04033f032c43f27726545dcdea4533b3ccbe7257
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-19 17:02:46 +00:00
hjk
95deefb5ac ProjectExplorerPlugin: Remove remaining used of global object pool
By moving ownership of the respective objects to the
pre-existing private class by making them full members,
following the general pattern used in the other plugins.

Change-Id: Ifea639b68f25f0cbcb06230dc71a16d1dd3ae5ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-19 13:41:18 +00:00
Tobias Hunger
8801240881 Qt: Use nullptr
Change-Id: I6f7f2b5c5d33e64d5630104521dd022002347075
Reviewed-by: hjk <hjk@qt.io>
2018-02-19 13:22:34 +00:00
Tobias Hunger
e9ff7ab90b Qmake: Quieten soft-assert
Change-Id: If8c62a7aa17ac46d8e09cf990a57fa9eb1526598
Reviewed-by: hjk <hjk@qt.io>
2018-02-19 13:22:28 +00:00
Tobias Hunger
997ece4361 Project: Remove unused Project::requiresTargetPanel(...)
Change-Id: I7a5298edefd7e26841c4070be23534dd33d093cb
Reviewed-by: hjk <hjk@qt.io>
2018-02-19 13:22:21 +00:00
Eike Ziller
d55271bc50 Increase timeout for relayout in file system view
Possibly a bit less annoying in case this happens.

Task-number: QTCREATORBUG-19800
Change-Id: Ib4fe1cb577ff493a5e7a563d22b645889ce71e88
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-19 11:35:57 +00:00
David Schulz
775b235f45 Core: register documentation asynchronously
Change-Id: I946ce394bc4e21a1c5746fb38dcc81acc1106ba4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-19 11:34:04 +00:00
hjk
da33f94e20 QmlProfiler: Pimpl QmlProfilerPlugin class a bit more
... to be able to remove an unneeded use of the global object pool.

Plus some code cosmetics.

Change-Id: Ifdb0ff9cd40820a34a8951563402a50a594e4fdd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-02-19 10:17:36 +00:00
Tobias Hunger
8059bf6204 Project: Make setRequiredKitPredicate private
Make calling Project::supportsKit(...) the default implementation.

Change-Id: I0e47972097e760e2ff3be229afb85eff839146b8
Reviewed-by: hjk <hjk@qt.io>
2018-02-19 09:28:02 +00:00
Eike Ziller
41efaf1253 Fix translation issue
The model doesn't have a translation context and it makes more sense to
use the one from the widget anyhow.

Change-Id: I9847e4651bc7482c1e460fddd9c6890178f806bd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-19 09:16:44 +00:00
Andre Hartmann
9467ed42c3 Add a file properties dialog
Task-number: QTCREATORBUG-19588
Change-Id: I75599459beb7e23812ba48670ae968585faefda9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-19 09:14:28 +00:00
Eike Ziller
378c438671 Fix usage of tr()
Change-Id: I24ff39ebe8061bb974e92afc02a9387ba9e2eef2
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-19 08:51:53 +00:00
hjk
8e83f6f0e7 Designer: Partially pimpl and remove used of global object pool
Change-Id: I88f43678fb07d00501e7b5c04e992acee292d7fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-19 08:34:05 +00:00
hjk
42d2c15239 ProjectExplorer: Set CustomRunConfiguration default name
It apparently showed up completely empty in the "Run configuration"
combobox after "Add".

Change-Id: I4fa40c54f9bfe9240070bb6fabeba35b1d885a01
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-19 07:07:47 +00:00
Christian Kandeler
02fdd984c2 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: I024a1535a5587a45bc3f319ab2723677eb242b89
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-16 20:10:54 +00:00
Ulf Hermann
45744fa725 HelpManager: Cache the registered documentation namespaces
Querying the namespaces is expensive as it involves a complicated SQL
query. We shouldn't do this if we don't need to. In this case we only
need the initial list. After that, we know if we add something to it.

Change-Id: I0c45ae6d39da686fa29a968d815dac3d68890208
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2018-02-16 09:47:31 +00:00
Eike Ziller
324de13b4e Fix ordering of items in open documents popup
When the document history was updated, it was cleaned of any items which
no longer had a document open for them. This worked fine when that only
happened when user closed documents. Nowadays this also happens when
suspending documents without user interaction.

Only remove items from the document history if they are no longer
available even as a suspended document.

Task-number: QTCREATORBUG-19758
Change-Id: I131a24823b5c456879b67a35b039768a15bd7716
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-16 08:32:34 +00:00
Eike Ziller
3060ddbcf3 Document model: Use optional for "indexOf" kind of methods
Change-Id: Iaffbb0b695f96b5b44c9fd0df63891c2797181b7
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-16 08:32:05 +00:00
hjk
231a9d2c58 RemoteLinux: Also decorate empty/invalid targets with device name
Change-Id: Iff9f80490ba3a59e0c17b28acd2376cfc0bf9d87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-16 07:32:51 +00:00
hjk
a3154bf299 QmlProjectPlugin: Clean up
- Remove unneeded use of global object pool
- Remove a few unneeded includes and declarations
- Un-export class, it's not used from the outside

Change-Id: Iddfcf74b754c936a8adb23c2caa6f7eef6d0e654
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-16 07:32:15 +00:00
Jarek Kobus
64233a4fae Fix repeting Stage/Unstage actions in unified diff editor
Don't store diff file index, chunk index and diff editor
controller anymore. Pass needed indices by value,
retrieve them when needed as lambda copy.

Change-Id: I3a81f1ab6d131c0b1d9899ac4b061b6e25582f51
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-16 06:48:27 +00:00
Jarek Kobus
9494a9e0c0 Don't route request for chunk actions through diff doc
Change-Id: Ia2c052ab4a39e99466d697b44b5d58a574408fb0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-02-16 06:48:16 +00:00
Jarek Kobus
11a6f000be Fix horizontal scrolling in sidebyside diff editor
Fix horizontal scrolling in sidebyside diff editor
when doing text search.

Change-Id: I6b52ee50544ef6005b8b79b87b9289dbc7f99dbf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-02-16 06:48:05 +00:00
David Schulz
b795cc152c Editor: make additional snippet info translatable
Additional snippet information is displayed in the options and when
completing snippets to distinguish between multiple snippets with the
same trigger.
This information is extracted from xml files. Translate these strings
like the information for external tools.

Task-number: QTCREATORBUG-5912
Change-Id: I90a22d687a99339b8f30c0de3b04b379085b6bd5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-16 06:09:20 +00:00
Christian Kandeler
5cf39393d9 ModelEditor: Simplify template syntax a bit
... using C++14's "_t" typdef.

Change-Id: I863ee99bdcfea92ae7fe6fda0eb1d1ee16db445d
Reviewed-by: hjk <hjk@qt.io>
2018-02-15 16:09:25 +00:00
hjk
018581a8c2 ProjectExplorer: Show non-desktop device names in remote run config names
So far we used device type in some cases, not even following a specific
pattern.

Showing the device name gives a bit more detail in cases of multiple devices
of the same type and offers the user a bit more control on what it shown.

Change-Id: I2bd6bbd404577db3afca0f84b8a976cb07b1cfd0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-15 14:29:02 +00:00
hjk
9f2bb5d0c5 ProjectExplorer: Simplify collection of RunConfigurationCreationInfos
Instead of calling twice for AutoCreated and UserCreated, call once
and record to which case it belongs. Only the 'both' and
'user only' combination are ever used.

Change-Id: I9c15085bcbb4bf6584a6156135f2084dbfc51c1c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-15 14:23:02 +00:00
hjk
3da9c89981 QmlJSEditorPlugin: Refactor
This follows the recently introduced pattern for plugin setup
- Pimpl QmlJSEditorPlugin
- remove unneeded uses of global object pool
- apply "static pattern"
- simplify some constructors of data members in some cases
- use in-class initialization in some case

Change-Id: I95b42d0885f4a8d6c9bfe1e4c004d3ace0a3eba5
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-15 13:31:13 +00:00
Tobias Hunger
4786c5928a SettingsAccessor: Rename BasicSettingsAccessor to SettingsAccessor
Rename BasicSettingsAccessor to SettingsAccessor, now that the name
is available again.

Change-Id: I49473f0c701976f992209f06d48decf047ab19de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-15 13:14:32 +00:00
Marco Bubke
56f79feebf Clang: Introduce CompilerMacro
We want not only the name but the value of the macro too. So we can
compare if anything has changed.

Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-15 09:58:53 +00:00
Marco Bubke
07fcd6f362 Utils: Simplify clone
Change-Id: I8b39696eee2ba8e19d827160bb80bd896491e69c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-15 09:58:42 +00:00
David Schulz
464a9ad9ab Editor: Fix block for offset calculation
Take block bounding rects into account, when calculating the row count
or the center visible line.

Change-Id: If933828867df25920eeb56359e9a42a8b95d9c6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-15 09:51:46 +00:00
David Schulz
c67902ec4e TextEditor: modernize codeassistant
Change-Id: I298d53b5b06765489b866e99a8b2c942c53454f8
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-15 08:00:35 +00:00
David Schulz
fab46508a2 TextEditor: modernize FunctionHintProposalWidget
Change-Id: I158d11c17b27e4a58a52f30607df72280ec539ea
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-15 08:00:26 +00:00
hjk
25b5433ae9 FakeVim: Squash MSVC warning about supposedly non-captured 'this'
Change-Id: Ibb81d15209d0c71a67f4707aa981b21fae1e3950
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-15 07:21:37 +00:00
hjk
892546bd6a Core: Minimize directly accessible SettingsDialog interface
Only the getSettingsDialog + exec combination was ever used. Make
that accessible by a free function, move everything else to
settingdialog.cpp.

Take the opportunity for some code cosmetics and remove a few
indirections by using direct members instead of pointers where
appropriate.

Change-Id: I14bc47395a85045ab439d418da0bc459add844bb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 16:37:08 +00:00
Alessandro Portale
b960448887 Core: Fix QComboBox in StyledBar in lightColored mode
Making sure that the text color in the combobox adapts to the background
color in lightColored mode.

Change-Id: I63ffbecde30be837540c0d4a1074ccbcbd31c756
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 15:47:27 +00:00
Alessandro Portale
0291afddfb Core: Use our own PREV and NEXT icons for find toolbar in light mode
Those definitely have the needed contrast against the background color.

Change-Id: If084e4084ac0dccd53def876e2ad75c561126e46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 15:09:42 +00:00
Alessandro Portale
4c0e86ecc1 utils: Fix StyleHelper::baseColor with lightColored
Change-Id: I3b06664585c0a608962f2d627859fd388bcb0372
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 15:09:29 +00:00
Marco Bubke
29a4419c07 Clang: Update symbol database if file has changed
The code in the symbol indexer is quite similar, but still different
enough to prevent easy reuse of the function.

Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 15:06:58 +00:00
Marco Bubke
dfb9e4355f Sqlite: Transaction catch exception in destructor
Fixes coverity warning. We want to throw an exception in the destructor
in this case, which is save because it is a RAII pattern and holds
only trivial values. Actually this is the only way to communicate that
rollback was failing. It is quite rare that it will be happen without an
exception is already thrown.

There is a non throwing variant too if you want to use it as a class
member.

Change-Id: Ie71ead19678619465c6ad9334d36ee666225dce7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 15:03:22 +00:00