Commit Graph

53252 Commits

Author SHA1 Message Date
Thomas Hartmann
59c5e65de1 QmlDesigner: Fix synchronization of integrated text editor
We always jump to the node offset even if the curser is inside the block.
Before the selection was not synced if selecting a parent item.
The selection was never synced if the root item was selected.

Task-number: QTCREATORBUG-19027
Change-Id: I0f7b4099488b6335588498f64e28e186898a7d25
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-20 14:32:30 +00:00
Leena Miettinen
506b372c76 SCXML Editor: Fix UI text
Change-Id: I2d6794682dfb05eaa3a926f33fffa039947afa87
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-10-20 14:17:34 +00:00
Leena Miettinen
01b8da891c Finding: Add a period to the end of an error message
Change-Id: I9b10ad5af08d5d9e97fa1511e3a066f499440cb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-20 13:45:03 +00:00
Thomas Hartmann
99eca09faa QmlDesigner: Fix API for frames
Change-Id: I2a7486da5a9213f9e16289ba437be7ac39cf9d7e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-20 13:33:03 +00:00
Thomas Hartmann
d65f26557e QmlDesigner: Fix crash
If the keyboard is used (delete) the list can be empty.

Change-Id: I7f67388d1af84091c8bc8b9a54345bb02dbf6ee2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-20 13:32:48 +00:00
Thomas Hartmann
781f15cfaf QmlDesigner: Export Theme
Change-Id: I7871e3add97742a00e128f57bdc2a15bde55ef30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-20 13:32:38 +00:00
Leena Miettinen
6c94391e93 Debugger: Fix punctuation in message
Change-Id: I048c2b9f295050cd5a5c6ad9fdebacf7e22c5f9f
Reviewed-by: hjk <hjk@qt.io>
2017-10-20 13:21:47 +00:00
Leena Miettinen
3cd6910315 Nim: Add period to the end of error message
Change-Id: I6ba6ca4f1e551329784cb44a3a2c48eef65c3b47
Reviewed-by: hjk <hjk@qt.io>
2017-10-20 13:16:46 +00:00
Filipe Azevedo
dbd812e641 Fix multiple connections on runner restarted
Change-Id: I5ea243d9f5d2266500378381b78c0b2610261f14
Reviewed-by: hjk <hjk@qt.io>
2017-10-20 13:16:20 +00:00
hjk
d91a004b24 Debugger/QNX: Use the new DebuggerTool portsgatherer
Change-Id: Id40f79d79079ee0745dc07ca7e46fdaef44f02a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-20 13:15:15 +00:00
Leena Miettinen
9d3607c669 Clang Static Analyzer: Fix a tooltip
Change-Id: Ieedd0b28ef46dfa935c29b3010cd178c8aa17f9a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-20 12:51:29 +00:00
Christian Kandeler
d8d26f94b5 QbsProjectManager: Consider "force probes" setting
...in the "equivalent command line" widget.

Change-Id: Id0b4758b49848a313b5a938c66be5ce4c99ef550
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-10-20 12:48:12 +00:00
Leena Miettinen
af97d0ce62 Android: Fix UI text
Change-Id: Ifae94cbd89c2af06b2c44c6a3872a24726b30c59
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-20 12:38:15 +00:00
Eike Ziller
1cbc20a693 File System View: Do not try to sync with bogus editors/documents
Documents that do not have a file name associated or are marked as
temporary should not be synced with, to avoid unnecessarily switching to
the "Computer" root. Examples are the VCS log and commit editors.

Change-Id: I6bc970eb026bf257b405fbc329aed3a5f4a456c0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-20 12:10:07 +00:00
Eike Ziller
e652865365 Fix line number handling for file based locator filters
We need to create the regular expression based on the split off file
name, not the whole search term.

Task-number: QTCREATORBUG-19129
Change-Id: I4df375e992ce2b9a64a9c8f2c12b953f66a9444e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-20 10:08:01 +00:00
hjk
9dadffd997 Debugger: Move disassembler style connection closer to its only use
Change-Id: I1ed462d41663e15cd05ee0d65b2080bfba179de7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-20 09:24:05 +00:00
Christian Kandeler
be9a2be7eb Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: I8083c634995ea9dd7d26521fb854ba6fbc3f9e39
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-20 09:10:02 +00:00
Eike Ziller
bbb74daf18 ModelEditor: Fix mixup of const vs non-const iterator
And prefer const iterator

Change-Id: I2fed0e1b80fc942c6a12800560d33bf7b608c831
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-20 08:11:01 +00:00
Tobias Hunger
3dc8498bc7 QmlPuppet: Fix run of QmlPuppet
Add QT_HOST_BINS to PATH before starting the puppet. This is necessary now since
the kits no longer add this via the Qt version.

Change-Id: I155b01b43517a3fd0b2936ff33709d9e6fad3f88
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-20 07:42:38 +00:00
hjk
959c13e298 Debugger: Remove some old debug code
I doubt this has been used in the last five years.

Change-Id: Ia81cacfead1d15f77cb7e1e438ebcd59a238af70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-20 06:23:31 +00:00
Alessandro Portale
1c0dc848e0 Git: Reduce the minimal height of the Gerrit dialog a bit
The current Gerrit dialog is too high for my 1366x768 screen, and
therefore it either misses the title bar or the confirmation buttons.

This change reduces the minimal height of the "changes" and "details"
sub-widgets proportionally.

Change-Id: I548e1e04bb47b881bee55e28bf362a84ae11a87c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-19 23:00:30 +00:00
Ulf Hermann
f846e488dd ProjectExplorer: Make sure toolControlChannel URLs come with a scheme
QML Profiler won't accept URLs without schemes anymore.

Change-Id: I54995ae7e9c1bcdb9f55fe5d56a45931f14cf890
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 16:26:21 +00:00
hjk
f1a4a10cfe RemoteLinux: Use the optional PortGatherer from the DebuggerRunTool
Change-Id: I4a79abff197ea72df421fbafe11823480719f4a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-19 16:02:42 +00:00
hjk
f521b2428d Debugger: Let the DebuggerRunTool optionally handle the PortsGatherer
Less code in the target implementations.

Change-Id: I759f082eba5eab7f4e8252c0d7b5ec64059ba860
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-19 16:02:34 +00:00
Eike Ziller
c99b8c2fd1 DocumentManager: Avoid unneeded allocation of potentially large list
Change-Id: I454f2cbf78e76ba7e86febcd9aa0ecd003edb3fa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:58:30 +00:00
Eike Ziller
981071d486 ExternalTools: Remove unneeded temporary container
keys().count() is the same as size() directly

Change-Id: I6606ebf431e6f472ba4bd346c5851fa6aa99ffdf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:58:18 +00:00
Eike Ziller
e26ac60f17 FileInProjectFinder: Avoid multiple construction of QFileInfo
Change-Id: Ic2db308ed6938d0ad67c84152eed209ac0e76bd9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:58:10 +00:00
Eike Ziller
30f0b6857a ExtensionSystem: Avoid using iterators from temporaries
Doing it can lead to unexpected results

Change-Id: I602cf6a4692c9e0c0adb4564679478ea25bf8829
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:58:02 +00:00
Ulf Hermann
56366cfd72 RemoteLinux: Set scheme on QML server URL
The connection manager won't accept URLs without schemes anymore.

Change-Id: I647a87a73afae394c5c52a827a7359919be7e43f
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 15:52:54 +00:00
Friedemann Kleint
9ee728caf3 Add clazyweb2tasks.pl for converting Clazy logs into .tasks files
Change-Id: I68a96b1124a8fa6d5e47253c29a94ae41a238fed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:40:35 +00:00
Tobias Hunger
acac4f029d ProjectTree: Clean up connects
Change-Id: Ib9adb893b804db868625331ecae71b6188cc9d25
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 14:41:53 +00:00
Leena Miettinen
b3dd11e49b Wizards: Remove period from a checkbox label
Change-Id: I2046652e5ee16b29c86ac0400f9ee3572904152a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 14:41:37 +00:00
Tobias Hunger
2d07ffdc7f QmlDesigner: WS fixes for puppetcreator
Change-Id: I14eefc6caf9a88fd6748b3b4450cfd826916874d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-19 14:41:32 +00:00
hjk
597488bef4 Debugger: Move some code around
Parts of the Debugger engine rampdown mechanisms are
essentially one code path now, don't distribute that
over four classes.

Change-Id: I4c6edbc0db94d1f658b0c1d9c154552f286db876
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-19 14:10:42 +00:00
Eike Ziller
5dfd48331f Json: Avoid using iterators from temporaries
Doing it can lead to unexpected behavior

Change-Id: If3f838cc5b5a381d7c33223adcf53051a43b7c3c
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-10-19 12:22:02 +00:00
Thomas Hartmann
558730ac24 QmlDesigner: Fix crash
Change-Id: Ife1a3760a4578b37f7942530ed698fad723fb784
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-19 12:07:51 +00:00
Christian Stenger
38d307ffb8 Squish: Adapt test to improved compiler detection
QC now finds some more compilers.

Change-Id: Icbf8d29a24c3360d2d7d8ed73011f705dd156aa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-19 10:28:56 +00:00
Filipe Azevedo
17f44b5a8f Don't run controls that get no produced workers
Change-Id: I9630620753f32934020d18266436472c869d9cd1
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 09:40:28 +00:00
Eike Ziller
9b8169d42f Remove unused class BraceMatcher
Change-Id: I8caac292ab36a28ed7e3d73d0a90d06ea1e88b0d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-19 08:33:22 +00:00
hjk
3d11a27ad0 Debugger: Consolidate "Attach to running process"
Change-Id: I78e89a662140f37f5f9719dbbbff070f1e2fbe84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-19 08:31:33 +00:00
Christian Stenger
6a470f0a70 AutoTest: Do not overwrite already found build system targets
Especially when using CMake based projects in combination with GTest
we might have lots of build targets defined inside the same
'project file'. Overwriting the already assigned content is purely
wrong. Instead handle each found build system target on its own.

Task-number: QTCREATORBUG-17882
Task-number: QTCREATORBUG-18932
Change-Id: I3297a9e1da8ae4186fd4267e3485368b1a059314
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-19 08:25:47 +00:00
Nikolai Kosjar
7cbc7af022 Clang: Fix completion after qualification (::)
...and maybe other cases.

Since

    Clang: fix findStartOfName handling
    commit 82d0650b11

the proposal's base position was calculated wrong. As a result, an early
return triggert in CodeAssistantPrivate::displayProposal (call to
newProposal->hasItemsToPropose(prefix, reason)) and no completions were
displayed.

Fix by ensuring that the added code from the mentioned commit is only
called when needed, namely only for function expressions.

Task-number: QTCREATORBUG-19083
Change-Id: I8f23c9b7186f9d81159939c8b3ef475a09bbe760
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-19 07:43:21 +00:00
Leena Miettinen
2aed9f5c97 Debugger: Fix punctuation and capitalization of UI text
Change-Id: Ifbe95f063c00401f6ad777e95b0d0ee96c77969b
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 07:23:03 +00:00
Leena Miettinen
ebf2bb7304 Qt Quick Designer: Fix the capitalization of a message box title
Change-Id: I4c0e84373c0d9cc31106b77c190daa52a83b02db
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-19 07:04:19 +00:00
Eike Ziller
c4dfd88444 QmlProjectRunConfiguration: Use QFileInfo::exists
One less indirection

Change-Id: I4b4f8000c2493a676bc02cff87a475f1f185e569
Reviewed-by: hjk <hjk@qt.io>
2017-10-19 06:42:09 +00:00
Eike Ziller
f2ef88aada QmlDesigner: Avoid some unneeded QFileInfo constructions
Change-Id: I0289c3187f07e26d05a7ca591cc8b12b767c3502
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-19 06:38:41 +00:00
Leena Miettinen
c7c0bbf511 Plugins: Fix capitalization of Plugin Loader Messages dialog
Change-Id: I5f3c45559f867fdc3751ff893b87279fe6fab79c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-18 15:11:11 +00:00
Tobias Hunger
613519c3d5 QtSupport: Do not prepend QT_HOST_BINS to PATH
Do not unconditionally prepend QT_HOST_BINS to PATH as part of the Kit
setup.

Prepend this directory to PATH in the Qmake- and GenericBuildConfigurations
instead.

Task-number: QTCREATORBUG-18714
Change-Id: I1c1d1362105b82f9c369d989e90d4f7079c2c9a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-18 14:48:01 +00:00
Tobias Hunger
813212396b BuildConfiguration: Make method name clearer
Make it clear that emitEnvironmentChanged also updates the cache of the
current environment.

Change-Id: I012c5a2b3d7d4037ed609b26e053ce0ce36f6cec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-18 14:36:28 +00:00
Tobias Hunger
015bb14ed9 GccToolChain: Improve addCommandPathToEnvironment
Use logic more similar to
BuildConfiguration::prependCompilerPathToEnvironment

Change-Id: I24935cc354f136b19ec71afd6e8a4d795446db4e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-18 14:35:26 +00:00