Commit Graph

54246 Commits

Author SHA1 Message Date
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
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
Ivan Donchevskii
b90f2fb251 Clang: Fix crash in connect() statement
With this patch ClangCodeModel can properly
handle static overloads together with non-static ones.

Code completion still might crash - requires another patch.

Task-number: QTCREATORBUG-19184
Change-Id: I12f0e8cb56b3bed3f5ca1f7a9fe4ca3932b78125
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-19 10:12:56 +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
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
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
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
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
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
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
Ulf Hermann
2ebf131ab1 Timeline: Only use details model when it's ready
Otherwise we get strange values in the Details texts, which distorts our
width calculation. Also, the RangeDetails window was 5px narrower than
its contents, which caused a glitch.

Task-number: QTCREATORBUG-19798
Change-Id: I2d3739b567ed8fb2c81c70176506d853cb4eb9b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-14 09:14:56 +00:00
Nikolai Kosjar
fc37af56ff CppTools: Disable text edit for built-in clang configs
Otherwise it looks like the options can be customized without copying
the configuration.

Change-Id: I7df26f8f2e3f566f659d12258730d2f514e9d71b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 07:24:29 +00:00
Nikolai Kosjar
936d639403 CppTools: Provide hint to copy clang diagnostic config
If a built-in/read-only configuration is selected, show a hint that it
needs to be copied to make customizations.

Change-Id: I62fc51b7548ec7cd6a156a0be84d9dcb41849ee7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 07:18:02 +00:00
Christian Stenger
e7a71672be AutoTest: Treat critical messages as warnings when filtering
Task-number: QTCREATORBUG-19795
Change-Id: Id314bd08af0e909fe717af6de836fc2aa451dea0
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-13 13:30:27 +00:00
Eike Ziller
c7bb8305d7 Add overlooked Goto Document Start/End shortcut settings
Change-Id: I2f60e2607660cea98aebb1057226010ea4837156
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-13 13:29:27 +00:00
Eike Ziller
36ccfbc8a7 Add option to disable bread crumbs in file system view
Looks like some people are annoyed by it, and another checkable action
for it is little effort and little clutter.

Change-Id: Ia2f3a070b30890e239f7f0a6ad859afc44c62016
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-13 13:28:49 +00:00
Thomas Hartmann
ca6d4a8877 QmlDesigner: Add static helper functions
Change-Id: If89619a7fe75b09afa53e2b33464364deccfcaee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-13 13:27:24 +00:00
Thomas Hartmann
7081ec8bec QmlDesigner: Ensure the semantic info is not outdated
When reformating we have to ensure the semantic info is not
outdated. If the semantic info is outdated we loose the latest changes.
We had a similar bug in the QmlJSTextEditor.

Change-Id: I38bb74c7db6d0449b692b3975d3e9eb89b7c3364
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-13 13:27:16 +00:00
Thomas Hartmann
61b6e2ee0f QmlDesigner: Fix clipping
We can only use the slightly extended boundingRect,
if the bounding rect is actually included in the clip region.
the clip region is smaller if the parent item has clip enabled.

Change-Id: Ia773f4402475ec984663af48cc1420a8840cc642
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-13 13:20:39 +00:00
Christian Stenger
e6f2d19b26 AutoTest: Handle qCritical similar to warning
If a test passes but produces qCritical() messages do
not display the test as failed, but as a pass with
warning instead.

Task-number: QTCREATORBUG-19795
Change-Id: Ied3f0ad38b96c87ea93f765db802ea0293f63544
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-13 12:54:40 +00:00
Christian Stenger
06b717bb16 AutoTest: Handle qCritical also for text based output
Task-number: QTCREATORBUG-19795
Change-Id: I0bbfecd4002df1958a3fc5cd795e193b1cb83cbd
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-13 12:54:35 +00:00
Eike Ziller
6ffe04bc40 Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: Iea598ba7f789f6176e90f26c7858e8c783eb2716
2018-02-13 13:04:39 +01:00
Eike Ziller
e6e7f8015c Use constants for settings keys
Change-Id: I81449a208840b4b00442e197501f13a0986fa1c5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-13 11:21:32 +00:00
Alessandro Portale
cebb667023 Valgrind: Use OPENFILE_TOOLBAR in toolbars
Change-Id: Ib154f6352006b827b771d033eddc939ac4dc6dfe
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 10:55:04 +00:00
Alessandro Portale
89053aca81 Utils: add a toolbar variant for the OPENFILE icon
Change-Id: I745e47b6bfe5cce8e04014f2666c3388fafeea3c
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 10:54:57 +00:00
Christian Stenger
cafb0760f6 Tests: Fix compile with Qt5.11
Function to convert char[] into QString has been deleted.

Change-Id: Iedf5db322b907d4ea1a20cc5c70394388d54f214
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-13 08:47:45 +00:00
Tobias Hunger
3874b6b6ec KitInformation: Improve robustness to nullptr passed as kit
All the KitInformation methods need to gracefully handle a kit that is
a nullptr. Ensure this is indeed the case.

This might fix the actual trigger for QTCREATORBUG-19469.

Change-Id: Id78ac8a26c1be908f41a425ff1935b86888e4b8b
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 08:46:35 +00:00
Nikolai Kosjar
d5c449575e Clang: Remove unused functions
These are left-overs from refactorings.

Change-Id: I0cfe3a6de8a19e09fde06c3dee9bde243f3bc52c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-12 18:10:59 +00:00
Christian Kandeler
ae20deb3a7 qbs build: Use project-global destination dir for libs and plugins
The autotests' rpath settings expect them there.

Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-02-12 15:34:18 +00:00
Ulf Hermann
76c12becad Debugger: Properly handle spontaneous stop on InferiorRunRequested
We need to transition into InferiorRunOk first.

Change-Id: Iea4770f70979a4700a3bb350376526bbe8c07952
Reviewed-by: hjk <hjk@qt.io>
2018-02-12 15:28:26 +00:00
Ulf Hermann
2132ed8c96 Debugger: Accept transition from InferiorStopOk to InferiorRunOk
This can happen if we continue after an automatic break point at
application start. Set the state to InferiorRunRequested first, and then
to InferiorRunOk.

Change-Id: I0c4094ef0b335f31099cceb49b23aa3bc1a9a7af
Task-number: QTCREATORBUG-19712
Reviewed-by: hjk <hjk@qt.io>
2018-02-12 15:28:14 +00:00
Leena Miettinen
b2909c1648 Doc: Describe new model editor features
- No longer experimental
- Scratch models
- Deployment and sequence diagrams
- Aligning elements in the editor
- Adding related elements
- Exporting selected elements (now from the File menu)
- Flat role
- Creating new package diagrams
- Updating include dependencies for packages
- Toolbarbuttons for zooming (the menu items were removed)

Change-Id: If951e55188572fd6af86b9c32ae6ee50b77d8b8e
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 11:47:37 +00:00
Robert Loehning
2109f3573f Wizards: Add missing spaces
Change-Id: If4bb6a48b1da1433c36e367c700d18a10fabe45d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-12 10:07:48 +00:00
Orgad Shaneh
8e43a51a33 GenericHighlighter: Update from KSyntaxHighlighting
ini.xml was also changed, but I disagree with this change
(which removed ; and # as comments in ini files), so I left
it untouched.

Change-Id: I203b0d9382ed404623ea8ba6545970230f0e50ca
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-12 07:14:57 +00:00
Christian Kandeler
ac1d3b6583 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: Ief55ebcaab4ecee6be78df447f965cebfc5d981c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 19:49:11 +00:00
Robert Loehning
43947fb868 Clang: Compile fix
Partially reverting 7282e05554

Change-Id: I114cd7d5da9905cd6ce7e1044f848aeac369be37
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:13:10 +00:00
Thomas Hartmann
0e6bed71cf QmlDesigner: Allow priorities for resource handlers
Change-Id: If9e9ad3ebc57ba2d80f3b1e89d0643223a00fe72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:03:38 +00:00
Robert Loehning
7282e05554 Improve translated strings
Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-09 16:36:54 +00:00
Christian Kandeler
8c7567c447 QbsProjectManager: Fix uniqueProductName() and productDisplayName()
These still assumed we can only multiplex on profiles.

Change-Id: Ice3dfe06c1be732ecae42db75155e930b0554b6f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 16:25:39 +00:00
Thomas Hartmann
7bca91cd23 NewDialog: Add setting to blacklist categories
Change-Id: I307ae05f08bf3bdbfc1b1a69bb10d8201ecf8436
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 16:23:06 +00:00
Christian Kandeler
d595896ea4 QbsProjectManager: Do not map QML debugging setting to Qt.declarative
QtQuick1 is no longer supported by Qt Creator.

Change-Id: I684ac12bca29779a18cc870e94071412edd29985
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 13:18:22 +00:00
Christian Kandeler
60a3fd59d4 QbsProjectManager: Use sensible default for enabling QML debugging
Task-number: QTCREATORBUG-19655
Change-Id: I2c330909c86c48f7c79fd2c016c41d82388e3c32
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:47 +00:00