Commit Graph

54723 Commits

Author SHA1 Message Date
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
Christian Stenger
f6f11b53a7 ProjectExplorer: Fix compile with Qt5.6 + gcc
Change-Id: Ibb6d00f7d036c996b85800c0baed606188a752e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 14:08:00 +00:00
Ulf Hermann
8e9454010b Android: Make qmlscene command configurable
Change-Id: Ife1dd4ae9fa3bcc822c27d744c3ed626bae99b8f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 14:03:39 +00:00
Ulf Hermann
8b867e88f4 Support QML preview with qmlproject on android
Change-Id: I53a074d2064ddd2a20e745250d9620cd1969928b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 14:03:33 +00:00
David Schulz
b4a1798618 TextEditor: add document content completer
Add completion based on words of the document. This provides basic
assistance for programming languages without a code model.

Task-number: QTCREATORBUG-13869
Change-Id: I3a9c59c741dfd6895442fc0524cfd1bd3b2b0111
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:38:22 +00:00
hjk
24520b9159 QmakeAndroidSupport: Pimpl and remove use of global object pool
Change-Id: I2b893ac8fd72d920a538739de2c0ccfa2a9ba354
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 13:34:15 +00:00
Tobias Hunger
6445fb19bb Settings: Add test to pick right file if several exist
Test picking the expected file when several exist in
BackingUpSettingsAccessor.

Change-Id: I09d346a98a8df13d6cf3ee53ee20ce34e45e8d28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:24:26 +00:00
Tobias Hunger
97cf4bb278 SettingsAccessor: Improve test by mocking out read/write operations
Change-Id: I4d4cf6ff0be3d4b8278a7613c26f2b1752304ad4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:24:11 +00:00
Tobias Hunger
b95bbe1d57 SettingsAccessor: Extract functionality to merge settings
Move functionality related to merging settings into MergingSettingsAccessor,
move code specific to the .user-files into UserFileAccessor.

Remove SettingsAccessor class, now that all code has been moved out of it.

This patch changes the merge mechanism a bit: It used to upgrade
the user and tha shared file to the higher version of these two, merge,
and then upgrade the merged result to the newest version.

Now it upgrades both the user as well as the shared file to the newest
version and only merges afterwards.

Change-Id: I2a1605cbe9b9fb1404fcfa9954a9f3410da0abb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:23:33 +00:00
Tobias Hunger
9ffd52f9c5 SettingsAccessor: Extract upgrading functionality
Extract upgrading functionality from SettingsAccessor into
UpgradingSettingsAccessor.

Fixes surprising behavior in test
ProjectExplorerPlugin::testUserFileAccessor_prepareToReadSettingsObsoleteVersionNewVersion
where the Version was thrown away.

Also adds a error/warning distinction to BasicSettingsAccessor::Issue,
so that the non-critical ones can be ignored later.

Change-Id: Ia38d074f91cd8d8f820f9bec96d3330d748564c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:23:25 +00:00
hjk
65078befce IosPlugin: Pimpl plugin class
Also generally follow the current plugin setup pattern,
remove unneeded uses of global plugin pool, move stuff
to the usual initialization phases.

Change-Id: I1eb1d8251be68aa095e07125d42451dae4a3dd06
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:43:56 +00:00
Ulf Hermann
6a964d8d0b Android: Support the extraenvvars and extraappparams options
The Qt/Android runtime does support passing parameters to the
application. We have to pass '-e extraappparams <base64 string>' and
'-e extraenvvars <base64 strings, concatenated by ";">'. This is very
handy and should actually be exposed in the GUI.

Change-Id: I8c84a53ab8f6f07ea5b6e01c902f53385df8b35f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:31:45 +00:00
Ulf Hermann
9771333f9f Android: Tolerate foreign run configurations
The only things specific to AndroidRunConfiguration are
amStartExtraArgs() and postFinishShellCommands(). Those are considered
to be empty on foreign configurations.

Change-Id: Ia0b8381c30225942e8704db04d17a8bdd3d2c806
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:31:15 +00:00
Ulf Hermann
b088972a9c Android: Tolerate empty build/deploy configurations
If there is no build or deploy configuration, just skip the building and
deploying.

Change-Id: I8b6f6d14100f366df5683eb77490d7c0dc588f94
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:30:49 +00:00
Thomas Hartmann
4ab5dbeb3a QmlDesigner: Use file engine to resolve resources in puppet
Task-number: QTCREATORBUG-19729
Change-Id: I1297180e29446429b949fc0bbc1b74055018bc28
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-14 11:49:42 +00:00
Robert Loehning
1fcd494cc7 Clang: Remove dead code
Change-Id: I609929ca7723c60e108e30b7789c4482ebff7228
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 11:06:53 +00:00
Robert Loehning
9f06af8dc2 Clang: Don't pass large object by value
Change-Id: I419d1bebb063a5c20fce1dbed17f2249acea71f9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-14 11:05:38 +00:00
Robert Loehning
3e4dd72c92 Clang: Initialize member
Change-Id: Ic04acb0ded01ffbd01c83b8eb7f17c9b163ccaf7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-14 11:03:22 +00:00
Leena Miettinen
87958fa3a4 Doc: Update links in the Welcome mode Tutorials tab
Remove links to some old talks and add links to QtWS 17 talks.
Update titles and tags. Create new icons.

Change-Id: I29e0a74c09c5274c88d34d990aba5b2652e330bc
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 10:47:49 +00:00
hjk
b0b4022470 Android: Some code cosmetics
The naming scheme of the internal object was changed
to the usual pimpl pattern.

Also setup device update connection in the device constructory

Change-Id: I5cbb7a9d870a7d1f0e91e54f2ad6dfb95ea63e37
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-14 10:12:07 +00:00
Friedemann Kleint
cbed562175 ImageViewer: Fix QBS build after adding the SVG multiexport feature
Amends cd85d3aba5.

Change-Id: I8acdb94ee4b1f6a30aee2644230b4b9e297a53fb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-14 09:51:22 +00:00
Ulf Hermann
da8fc2573e Timeline: Don't restrict scales to 32bit integers
The JavaScript bit shift operators are 32bit only, and the QML "int"
type is "about -2G to +2G", so use multiplication and division instead
of bit shift and store the results as double.

Change-Id: If13c264e9e8a09ddc37675850b107411ee0b120f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-02-14 09:48:48 +00:00