Commit Graph

57165 Commits

Author SHA1 Message Date
Tobias Hunger
ccfb7c6aa4 CMake: Make handling of default CMakeTool more consistent
Change-Id: Idc2ba2c51122855f0b335f89ca5f916dea7665c5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-03 08:33:37 +00:00
Thomas Hartmann
29e6659e90 QmlDesigner: Fix crash
This does not fix the bug altogether,
but if escaped quotes inside translatable strings are required,
then those can be done in the text editor.

The crash is turned into an error message.

Task-number: QTCREATORBUG-20684
Change-Id: I702628fbe888450a27c07166d5adacde37b5d1e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-03 07:36:26 +00:00
Ulf Hermann
b9328012b1 Debugger: Do not switch to design mode when hitting a break point
Change-Id: I2b31aa78a707ca830382095f20d33439caa830ac
Task-number: QTCREATORBUG-20712
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-03 07:17:32 +00:00
hjk
b3f4282edc FakeVim: Add support for :wqa
Task-number: QTCREATORBUG-20699
Change-Id: I01e5e69abe9a7192f19d604847443f550a20ef0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Lukas Holecek <hluk@email.cz>
2018-07-02 14:01:42 +00:00
Christian Stenger
ae01fe7c42 Core: Fix missing include
Change-Id: I6dfee20b3bd2e0ca4c0f3e8a2f8cd013157dd863
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-07-02 13:15:02 +00:00
Orgad Shaneh
eb711d9864 VCS: Fix off-by-one line in blame
Line is blockNumber()+1. When executing blame, the cursor jumps to one line
above the selected line.

Change-Id: Ia28b6c5a353ee979fae3f463b864d1409d9649cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-02 11:21:42 +00:00
Christian Stenger
65a4333f2c Dumper: Fix detection of Qt namespace
Task-number: QTCREATORBUG-19620
Change-Id: Icca654714b70c69522b51998be21cff80bc29fac
Reviewed-by: hjk <hjk@qt.io>
2018-07-02 10:17:48 +00:00
Tobias Hunger
a15a7052c4 CMake: Simplify CMakeTool registration in CMakeToolManager
Change-Id: Ida5e6aea8c39ef21f535e06c8fed11b130f875e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-02 09:54:34 +00:00
Tobias Hunger
2127f96f5f CMake: Remove CMakeTool::addCMakeTool method
Change-Id: I9c6abb58711acc14ae78d79b6f077034389c0a6f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-02 09:54:26 +00:00
hjk
c08aab7b96 Android: Move most of QmakeAndroidBuildApkStepWidget to base
... as new AndroidBuildApkStepWidget, after renaming the previous
AndroidBuildApkStepWidget to AndroidBuildApkStepInnerWidget as this
is only a part of the whole widget.

There is clean up potential left for a later change.

Change-Id: Ie631537dfdaeb41b8d3b178047825312972d7439
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-07-02 09:21:29 +00:00
hjk
e9f1edf5ce Android: Move AndroidExtraLibraryListModel to base
Instead of having the full class build-system dependent,
by relying on four more AndroidQtSupport functions for now.

Change-Id: I26842f3ec70b875ba4481ae36d8c85f86366cb88
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-07-02 09:21:22 +00:00
Robert Loehning
9e6fe45ad9 Squish: Fix for Qt 5.11
The items in the treeView look slightly different than
with Qt 5.10 and thus seem to lose the mouseclicks.

Change-Id: Ibee1abdbc9e9bfe622b45f76ed5e612e81fd1770
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-02 09:10:58 +00:00
Eike Ziller
25fb87f9e7 Move editor factory search function to recently created private header
Change-Id: I74a9a58c679c265c6d723209705323e83901e040
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-02 08:24:25 +00:00
Eike Ziller
b2d844b22a Allow changing the default editor for mime types
Double-clicking or clicking on the selected item shows a combo box with
all editor types that can handle that mime type.
Modified handlers are shown in italic, and a new button resets all
handlers to the default.

Change-Id: I4083c31e3867eb2a2a47adc85e4bd20f3d57be9a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-02 08:24:05 +00:00
Orgad Shaneh
d2a7adba56 GenericHighlighter: Update from KSyntaxHighlighting
Change-Id: I81891762ceb44c7329a75e6d982532419102a232
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-02 07:50:40 +00:00
Orgad Shaneh
e5a8958e31 GenericHighlighter: Support WordDetect
Added in Kate 3.5 (KDE 4.5).

Similar to StringDetect, but only matches whole word (\b<string>\b)

Already used in some of the built-in highlighters.

Change-Id: I03ae5e1db917e777a21bb96d9a31cc7771287f39
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-02 07:50:29 +00:00
Christian Kandeler
58df07bc76 Update qbs submodule
TO HEAD of 1.12 branch.

Change-Id: I7308b718af0baf95b931183a686ac034609c9433
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-07-02 07:29:28 +00:00
Eike Ziller
a948d5223c Fix ICC build
"error: constexpr constructor must initialize direct base class"

Task-number: QTCREATORBUG-20598
Change-Id: Iab2e379b7ed3b0cb7f9b7c654613ec6cd3d91967
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2018-07-02 06:59:14 +00:00
Christian Stenger
1207fd3a94 Doc: Fix link target
Name of target file has changed.

Change-Id: I5e80fdeab00d09671bf7be20a647117c894f8165
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-07-02 05:38:36 +00:00
Sergey Belyashov
e7d479dc80 Update Russian translation
Change-Id: I13737f490a7e4b46319fcae99f641a9bc8538184
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-06-29 14:27:17 +00:00
Tobias Hunger
dca645f4c0 CMake: Fix header-related issues in CMakeToolManager
Just reorder some lines, make it clearer where the headers are actually
used.

Change-Id: Iec5cf98e7cfad7ee1bdd98df85df38b03c54dff4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:43:11 +00:00
Tobias Hunger
1c014c7573 CMake: Remove handling of legacy settings for CMake
Remove the code that reads CMake tool location from the Qt Creator settings
and then removes them from there.

This code was added in QtC 4.1 to ease transition to the (back then) new
cmaketools.xml settings file.

Change-Id: Ice96628159f4171716882cfdefc8991ec2341556
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:43:03 +00:00
Tobias Hunger
9c1fd4c2aa CMake: Move CMakeTool merging into separate function
Change-Id: I7c70e0aa09def8c7483d183791a76e56be18a0a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:42:51 +00:00
Tobias Hunger
f5d51dcb69 CMake: Simplify restoration of CMakeTools a bit
Change-Id: If62acc96bb64e8e0c2767e35d4f2bca43cc23c65
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:42:41 +00:00
Tobias Hunger
be7109d732 CMake: Move code around a bit
Change-Id: I6129ee26ddd6ef2af713ad249dc884e63c1d5d6e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:41:56 +00:00
Tobias Hunger
88438a0e79 CMake: Small simplification
Change-Id: Ib89f95febeb45628e99e3c6a473853da4dcde3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-29 13:41:49 +00:00
Eike Ziller
09a761ad7b Fix issues with saving files on network drives on Windows
In these cases the user might not have sufficient rights for
ReplaceFile to merge all file attributes and ACLs.
Make ReplaceFile ignore these errors.

Task-number: QTCREATORBUG-20560
Change-Id: I6980d8af66cb7200c39726f0e7273df83c99bf5c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-06-29 10:53:08 +00:00
Marco Benelli
067a7e903e QmlJs: avoid adding unnecessary lines in reformatting
The reformatter used to add unnecessary empty lines, notably before
comments after import declarations.

Task-number: QTCREATORBUG-18332
Change-Id: I96d6f2dd53d1197aa6bc0b834971a66861b2f498
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2018-06-29 09:13:13 +00:00
Christian Stenger
2801372d46 Squish: Fix expected targets for widget app wizard
Reverts cd45ce5f39.

Change-Id: I6865e6c91fd961ac36da160a01c676f5274c40cc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-29 05:17:55 +00:00
Christian Stenger
3f54c55e58 Squish: Handle more server side issues
If we get correct http responses that point to server side
issues handle them appropriate if possible to let the test
continue instead of crash.

Change-Id: I7d2e8848269600762e9c7fe980414c4f7106433c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-29 05:16:30 +00:00
Ivan Donchevskii
be3e848c0f Clang: Don't analyze same file multiple times
Diagnostics do not depend much on project parts. But
having the same file twice can result in duplicated
diagnostics which later can cause the same fix-it
being applied twice and getting corrupted code.

Change-Id: Ie2809af7a54034b05df9383875f7c3123aea58e8
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-28 12:50:34 +00:00
Eike Ziller
66a271a150 Fix inserting tasks into issues pane
When tasks are inserted into the source model, the source indices in the
filtered model after the new items where not updated correctly.
The indices must be increased by the number of items added to the source
model, not the number of items added to the filtered model (which can be
less).

Task-number: QTCREATORBUG-20542
Task-number: QTCREATORBUG-18951
Change-Id: Idae9cf4241c31229dadf5c9fea383aef3fdfffb0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-06-28 11:10:19 +00:00
Eike Ziller
702d6a6914 TaskModel: Bit of code cleanup
Do not send rowsRemoved before source model has removed the rows from
its data.
Add some QTC_ASSERTS and comments.
Replace trivial slot by lambda.

Change-Id: I7a0df404f757fca5f7724be66e516824ecd292dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-06-28 11:09:07 +00:00
Joerg Bornemann
85b0f4dc91 WinDebugInterface: Remove blocking connection to main thread
The debugOutput() signal was connected via BlockingQueuedConnection and
blocks the WinDebugInterface thread until the signal is received. If we
signal "buffer ready" afterwards, all OutputDebugString calls (of all
processes of the system) that wait for "buffer ready" also wait for our
internal signal delivery. This can lead to hangs in circumstances where
the event loop is currently unable to deliver the signal.

Remove the blocking queued connection, and introduce an internal
_q_debugOutputReady() signal that is emitted whenever new debug output
is available. This signal is queued-connected to a dispatchDebugOutput
function, which is running in the main thread. That function retrieves
the data from the WinDebugInterfaceThread and emits debugOutput(qint64,
QString). This massively reduces the event queue load without blocking
the WinDebugInterface thread.

Task-number: QTCREATORBUG-20640
Change-Id: I91f8f794af8da2a695c2b897f678844b142a5991
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-28 09:26:05 +00:00
Ivan Donchevskii
e99d09f846 Clang: Properly apply fix-its from header files
Diagnostic may also include fix-its for the header
which require different handling.

Task-number: QTCREATORBUG-20517
Change-Id: I3e745622801be3fa2856d968b0c7a2a2aeb89b50
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-28 09:11:49 +00:00
Ivan Donchevskii
fcfa98ab7c Clang: Fix comma-separated class members in symbol outline
Check for the actual lexical parent in addition to ranges.

Task-number: QTCREATORBUG-20656
Change-Id: Ie2ead5cd02e83f9fd201825ee80d1633679a6402
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-06-28 09:11:39 +00:00
Christian Kandeler
ba050c2dd1 sdktool: Fix qbs build
Change-Id: I0a6ccc909cb0d64e27d5fe8c9b8a740d22158115
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-28 08:25:01 +00:00
Ivan Donchevskii
ef9c68798d CppTools: Fix getting locator filters from the object pool
They are no longer inside the global object pool.
Get them from CppModelManager instead.

Task-number: QTCREATORBUG-20678
Change-Id: Ifb3221a812295e1dcfe8b59ea693a4b350cbcc2e
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-28 07:42:27 +00:00
Ivan Donchevskii
75470bae65 Clang: Fix Q_PROPERTY return type
Check for the Clang macro was not removed here.

Change-Id: I5b6c6d971e892fd02ef21935e2a8766d9f0d6d5d
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-28 07:15:40 +00:00
Leena Miettinen
682b3079d2 Doc: Add a link to Acknowledgements to the front page
Change-Id: I405ceb8a4490c94c5ad695f06fb902c0a3f154a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-28 07:06:13 +00:00
Christian Stenger
ce12c239ff ProjectExplorer: Fix replaceSubtree for project nodes
Ensure to keep node alive as long as needed.

Task-number: QTCREATORBUG-20616
Change-Id: I57a720d3e31e14bcb8388de5fef68f70db370c90
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-27 13:09:00 +00:00
Tobias Hunger
8128d89a0b CMake: Remove cmake autodetectionhelpers
No user in-tree and the Ubuntu SDK for which this code was added
is no more.

Change-Id: I5b0c5f6faccf1adb451c4043378a204bfc350e50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-27 13:07:43 +00:00
Nikolai Kosjar
32614e9983 Clang: Avoid using -isystem include paths
...as this leads to file locking issues on Windows and pointless
diagnostics we currently ignore when opening files from -isystem include
paths.

The usage of -isystem suppressed warnings from system headers and
resulted in a performance boost. Nowadays we can preserve this
performance optimization by making use of the new
CXTranslationUnit_IgnoreWarningsFromIncludedFiles. This flag helps us
also to suppress diagnostics from clang tidy checks, which reported
diagnostics even for -isystem headers.

Change-Id: I33e1f7169e2ff9f17c811565a5324b9da4740701
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-27 12:57:57 +00:00
Leena Miettinen
7d076e9e26 Doc: Add a link to contributor list to the Acknowledgements page
Task-number: QTCREATORBUG-20683
Change-Id: I9d2debac7badda999e129ca1b5d3d04923642f91
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-06-27 12:11:30 +00:00
Alessandro Portale
dad5e41ca9 Utils: Separate the filter icon from the expand arrow
...so that the filter funnel can be used stand-alone

Change-Id: Ic8675954edd4234f84de8caffedd1a67b67b2edd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-27 11:41:46 +00:00
David Schulz
afe0a73f91 WinRt: restrict WinRt deployment steps to WinRt devices
Task-number: QTCREATORBUG-20647
Change-Id: I8bc4cf8b4cce66f062ef7523f5c0cdeef759ea9d
Reviewed-by: hjk <hjk@qt.io>
2018-06-27 10:59:21 +00:00
Orgad Shaneh
b82ffb917b VcsCommand: Block auto reload while a command is running
Git rebase is executed in the background, and it can change a file multiple
times in a short period. If we reparse a file while this happens on
Windows, Git fails to replace it, the rebase action fails and the
repository becomes unstable (remains with a modified file).

See discussion at https://github.com/git-for-windows/git/pull/1666

Task-number: QTCREATORBUG-15449
Change-Id: Iba40a770a1df2dfff0dd1c874c491dfbe1cceb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-27 09:43:47 +00:00
Vikas Pachdha
b10ada3aff Android: Change the minimum API level supported
Change-Id: Iea6b1720c64810c490e4c9876ecb5ff8c8a9a935
Reviewed-by: hjk <hjk@qt.io>
2018-06-27 07:13:36 +00:00
Alessandro Portale
caff9f9aac Use C++11’s override and remove virtual where applicable
Fixes warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I4b8b8ecce028dfd051fe14984b40115e92057a40
Reviewed-by: hjk <hjk@qt.io>
2018-06-27 07:13:21 +00:00
Ulf Hermann
9a4f0317c1 Clang: only build with LibTooling if explicitly enabled
The feature is experimental and should not be used, yet.

Change-Id: Ifb9a651dcbaade5801ac28f900030407f12dc844
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-27 06:57:19 +00:00