Commit Graph

44349 Commits

Author SHA1 Message Date
Eike Ziller
ca636d9146 Locator: Fix missing popup frame on Win/Lin
Change-Id: Idaea2197d8666a251cef46fa9032494e91cc29a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-06 08:38:58 +00:00
Eike Ziller
7c67282cf0 Give locator popup list a bit more spacing again
The change to using the search result item delegate made the items
squeeze pretty much together. Explicitly add some spacing again.

Task-number: QTCREATORBUG-18457
Change-Id: If056b94e5a1629be574a0d864361dc72e356544a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-06 08:38:29 +00:00
Thomas Hartmann
e1615024cf QmlDesigner: Fix rubberband
Everyone agreed that the rubberband selection should be
inclusive. There is no need to require that all items are sub children
of the same item. This seems confusing.

Change-Id: I5fffbc72e0ef15a82fc9f0ab589c865581359775
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-06 07:38:09 +00:00
Thomas Hartmann
7400ad0a5a QmlDesigner: Fix invert selection
InvertSelection was not properly implemented.

Change-Id: I101105b33f8e2b9ed7b62a06d6330cbbfd87879a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-06 07:37:56 +00:00
Orgad Shaneh
6c5d1aee29 ProjectExplorer: Avoid updates to welcome during shutdown
It causes a crash when shutting down while the debugger is running.

Change-Id: I2f8e7dd957b5337e5c6891263d8e73bb37fff681
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-06 05:37:19 +00:00
Eike Ziller
fd112e41fe Merge remote-tracking branch 'origin/master' into 4.4
Change-Id: I09a8dae9f7d66d193f382143dde915519bd329df
2017-07-05 20:11:06 +02:00
Jarek Kobus
13fc3c8313 DiffEditor: Share "failed" state among multiple views
Change-Id: Id049ce8eafcb21d5e60fae17c47df8657c0e5779
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:20:46 +00:00
Jarek Kobus
6509753e86 Make it possible to cancel async diff calculation
Change-Id: I38fe86159daab794d060860de6ee5ab30fb395eb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:20:16 +00:00
Jarek Kobus
4bea049c45 VcsBase: Create common base diff editor controller
Reuse it in subversion and git plugins.
It makes subversion diff more asynchronous than before.
Make VcsBase plugin dependand on DiffEditor plugin.

Change-Id: Iafea2941b890a95a269362e022af2dc03cdea550
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:20:07 +00:00
Jarek Kobus
0a2590e7be DiffEditor: process git diffs asynchronously
It won't freeze GUI in case of huge diffs.

Change-Id: Ida6bdcb1ef6867969cd86d4bc9652c64bc74e6ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:19:42 +00:00
Ivan Donchevskii
985180d384 Toolchain: set triple in msvctoolchain class
Move triple set up to msvc toolchain class,
use another triple for x86_64

Change-Id: I3aebb051eb5d93accc6073e01391bf972199c2cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:19:00 +00:00
hjk
d857fa52f7 ProjectExplorer: Fix recent indeterministic state of stop button
The recent RunControl related changes have led to several regressions
in the fragile handling of button states in the output pane.

Take advantage of the new Starting phase to fix disabling of the
run and enabling of the stop button at reasonable times.

Change-Id: Iae191a840484dd08d61facf6b9f439bfafcbbcb0
Task-number: QTCREATORBUG-18508
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:17:13 +00:00
Eike Ziller
229cfdb356 Merge remote-tracking branch 'origin/4.4'
Change-Id: Ifed3b94905169cbd3cd1dd720f95e187734129c7
2017-07-05 14:58:03 +02:00
Eike Ziller
11333a03cd Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: I624040b7910d4025208709b22157869c6085df2f
2017-07-05 14:55:46 +02:00
Vikas Pachdha
78f9ff036f Remove code noise
Change-Id: I34d5df0be0a7772f9e08635afb398d6289840a92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 12:30:46 +00:00
hjk
0a56184030 Debugger: Remove some no-more-needed and uncompilable declaration
Change-Id: I43177c64b9079e500f34abe7bbc7891c8989bdb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-05 12:30:08 +00:00
Vikas Pachdha
18638d5560 iOS: Add UI for simulator device management
UI under devices tab to enable iOS simulator device management

Task-number: QTCREATORBUG-17602
Change-Id: I66dbf57f07dac107c253518ded5ffd78b8ce4555
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 12:29:13 +00:00
Eike Ziller
4ab18cde0e Fix build on Clang/macOS
Broke with dae4477cd3

Change-Id: Ia948d7d70f9e30f2f59b38da231831c0e78c79e1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 10:17:17 +00:00
Nikolai Kosjar
2747985358 Clang: Gray out diagnostics on document change
When reparses take a while, this is helpful.

Change-Id: Ie2003a3d65b30d944d20fa19dd4161412182851c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-05 08:47:34 +00:00
Tobias Hunger
144cfd83b0 Debugger: Fix build
Change-Id: I9e9231b17b6ded2260854fe60ecc8a9aae63ceb5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-07-05 08:33:06 +00:00
Joerg Bornemann
e8dfe2f91d Fix namespaced build
Change-Id: Idf7716093c0fdaeb494d9427a894a4ea44cab95a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-04 16:19:14 +00:00
Tomasz Olszak
70ffdb99d8 Add QML2_IMPORT_PATH to qmlplugindump if defined in build configuration
Change-Id: I0e3a6beda6cca2a065b2d47115b04362d82c879a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-07-04 14:45:29 +00:00
Marco Benelli
8e72432654 QmlJs: avoid overwrites by auto-completion
During auto-completion, the cursor used to randomly jump to the
beginning of line, eventually overwriting existing text.
This patch blocks the signals of the selectionModel while it refreshes
the content of the outline model.
Also cleans up a unnecessary variable and make it clear where we blocks
with using a lambda.

Task-number: QTCREATORBUG-18449
Change-Id: I94317c76b4e13d07ef7f3355b766e5473ab21011
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-04 12:17:40 +00:00
Eike Ziller
526e40cba3 Merge remote-tracking branch 'origin/master' into 4.4
Change-Id: I00fe351ee5f2689366c63ba94b042609c47da777
2017-07-04 13:55:35 +02:00
Christian Stenger
ccef9c0294 Valgrind: Fix plugin unit tests
The original tests were written for an older version of valgrind.
Additionally mark startup checks as expected to fail as the error
codes are not processed at the moment.

Change-Id: Iaad272b5977da3a3395064270d2c9442a3e2f313
Reviewed-by: hjk <hjk@qt.io>
2017-07-04 10:55:46 +00:00
Marco Bubke
3c6a2b7912 Extend search pane
The search term line edit can now be hidden away and the options are
hidden too too if they are all disabled.

Change-Id: I2363d010acbdabb2abfc6c6cd2f98c07cd7d3a3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-04 09:08:17 +00:00
David Schulz
15750db434 Editor: Correctly reset cursor for automatically inserted text
Change-Id: I7f9eee035cf3b85321de6d3f2a7a1d62e4e58376
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-04 09:06:02 +00:00
Nikolai Kosjar
93251de4b1 TextEditor: Fix crash on F1
Change-Id: I5f834417ff68544189297e30ef4364b14fa5d162
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-04 08:21:55 +00:00
Thomas Hartmann
7155a10bb7 QmlDesigner: Fix potential crash
Ensure the navigator is not crashing if no model is attached.

Task-number: QTCREATORBUG-18420
Change-Id: I2748e61d34621167ff5908409046f8171ff76c85
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-04 08:20:26 +00:00
hjk
6e7a31c4fe Debugger: Move startupRunConfiguration to RunConfiguration
It's not really debugger-specific.

Change-Id: I2246e08d896df1d625ecce9b8b5428e7ea398851
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-04 06:48:13 +00:00
Christian Stenger
6ec8d1a7aa AutoTest: Add optional verbosity for Qt tests
Add options allowing verbose benchmarks and logging
of signals and slots inside Qt tests.
Beside this fixing a typo (recognition of results
of type info) inside the plain text reader.

Change-Id: Iaba7112c55bf30213584e56858d096c8f78307d0
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-04 05:50:23 +00:00
Tim Jenssen
4823bc506c Clang: fix QDebug for SmallStringView
Change-Id: I54b200dc142d3d143fd3238ea97c4d6277c6604f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-03 18:17:15 +00:00
Eike Ziller
1724ad7572 LinuxDevice: Add missing overrides
Change-Id: I78663056be4e5759e94b2f94c07c82b5251c31a1
Reviewed-by: hjk <hjk@qt.io>
2017-07-03 15:29:39 +00:00
hjk
3408b1ed30 Valgrind: Simplify RunControlFactory setup
Change-Id: Ibef142e84ce1d4aca299dd8fa53b1eabcf517100
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-03 15:19:13 +00:00
Eike Ziller
d12f5ca4aa Remove unused IAssistProvider::supportsEditor
Change-Id: Ieb2a36bfddbf4f2cade02cbf62b28d112dcb8f10
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-03 13:23:08 +00:00
hjk
9bcbf4eec3 Qnx: Remove RunControlFactory
Registering the main runWorkers is enough.

Change-Id: I0d2d148c6247e403463b548ca05993e18b0d88ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-03 13:02:07 +00:00
David Schulz
9d8b8ba65d TextEditor: Animate automatically completed text
Change-Id: I35a183821363a201a68200f8692bf18dd36faed7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-03 12:34:36 +00:00
Marco Bubke
e7f5a379c6 Clang: Workaround to fix compile for emplace
Change-Id: Ic99f67819461eb682e531c578652336b6e2ada8d
Reviewed-by: hjk <hjk@qt.io>
2017-07-03 10:53:21 +00:00
Ivan Donchevskii
277b331389 Fix build
Move constructor definition to .cpp file to
avoid it being inlined

Change-Id: I1c55095e5158740526af9e698c978abf33304e52
Reviewed-by: hjk <hjk@qt.io>
2017-07-03 10:23:41 +00:00
Tim Jenssen
23cae9a9e0 Clang: Filter duplicates in clang query output
Because we can visit headers many times, we get results many times too.

Change-Id: I3bbe7d7a5d01c2580a4569bfe115f14a69edc8a7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-03 09:57:57 +00:00
Ivan Donchevskii
07c3a37054 Utils: improve failed file saving behavior
Remove temporary files left after fail.
Set error string for locked file.

Task-number: QTCREATORBUG-15449
Change-Id: Ibc8b01a4ea47870c29493a69718db929070ac13f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-07-03 09:29:51 +00:00
Ivan Donchevskii
1607a34a9a Utils: use unique_ptr for QFile object
Do not use raw pointer.

Change-Id: I6810c3ec3a60a43829130cf5e5a00e52db95b965
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-03 09:28:53 +00:00
Tim Jenssen
dae4477cd3 Clang: Make file ids unique
Clang file ids are only unique for one query. Because we query in parallel
we have to manage our own unique ids.

Change-Id: I67d57d8b1766cab75ad252a14e57bbf9dc5fdb79
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-03 09:27:05 +00:00
Nikolai Kosjar
35ca318d18 TextEditor: Add comment for convertPosition()
Change-Id: I45883ad3d42b41bbb2ecfe79805ae34c69eeeab4
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-03 09:26:31 +00:00
Eike Ziller
6021535173 Merge remote-tracking branch 'origin/4.4'
Change-Id: I5b2beb01c6eaeceb897e3a81b790122af5f0d7a1
2017-07-03 10:28:59 +02:00
Alexander Drozdov
c346183768 GDB: fix information text truncation in Application Output pane
GdbEngine::handleResponse() incorrectly handles messages starts
with '@'. Seems that text position pointer by `from` and `to`
vars already correctly configured and additional cutting with
QString::mid() is not required.

Seems issue was introduced by 726b907cc3.

Change-Id: I2759d1c1650a1949c9c9feb75cf12e2760920d21
Task-number: QTCREATORBUG-18494
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
2017-07-03 07:52:07 +00:00
Nikolai Kosjar
999e6bc671 TextEditor: Allow asynchronous hover handlers
Change-Id: I956b126e2c779aa81f86e4432d127b45ac1912ff
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-03 07:42:12 +00:00
David Schulz
6e51fd2a0c TextEditor: Use correct format for auto complete highlight
Change-Id: Icb9800a286417077985ad9c0acedeb9b06b456cc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-03 07:37:17 +00:00
Eike Ziller
f870446677 Add Locator to extra editor windows
And open a popup if other windows are active.
That way we avoid switching to the main window.

Change-Id: Ia6d8d3fb4361ac31e406356d40056a2c0b79d114
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-03 07:03:39 +00:00
Tomasz Olszak
38296f6acc Fix inserting the same multiple items to PathsAndLanguages
Change-Id: Ie1df6fad425fd7198a72f531c19b3681627a5210
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-07-03 06:45:03 +00:00