Commit Graph

57214 Commits

Author SHA1 Message Date
Orgad Shaneh
4162543cf2 Qbs: Add variable chooser to install path chooser
+ fix display of install root with variables in equivalent command line.

Change-Id: I9f8ab6dba80afddd0ee5116947c11752ded8129f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-25 10:25:47 +00:00
Ivan Donchevskii
d05fe2fe15 Clang: Re-enable tests which do not fail anymore
Change-Id: I1f8f396eeb8e97a8910bc2bd454227a395330f31
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-25 10:25:01 +00:00
Christian Kandeler
effc565006 QbsProjectManager: Prevent "special properties" in the line edit
... of the build step widget. By "special properties" we mean those for
which a dedicated UI element exists.

Fixes: QTCREATORBUG-21363
Change-Id: I8b136798340c1a2cdc178451247a9f1f77d91dd7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-25 09:03:44 +00:00
Orgad Shaneh
618d8e02d1 GitEditor: Fix resolving of working directory for non-existent source
Change-Id: Ie92be6b0aa6816b5c3a2bfed4a89163f2260d12b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-25 08:27:05 +00:00
Ivan Donchevskii
039a34a369 Clang: Adapt priorities for the same method/constructor overloads
CXXMethod and CXXConstructor may have different priorities
depending ony their origin and attributes. To keep them together
in the sorted list we adapt their priorities to have the same
value if their names match.
To continue keeping ClassCompletion before ConstructorCompletion
change the order of the completion kinds for the sort purposes.

Change-Id: I36efe5d5dbaa77d604a54b1dafe07d67f44db4c9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-25 07:10:12 +00:00
Orgad Shaneh
b00017e0ad FileName: Add a soft assertion against invalid parent in parentDir
In case isRoot() returns false, but cleanPath fails to find the parent
directory, return an empty string.

For example: QDir::cleanPath("D:/..") returns "D:/.." on Windows.

I'm not aware of any concrete case when this can happen, but let's be
cautious.

Change-Id: I0f4af5f5c11bb768d99d90290a4a1a6a1bda7c27
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-25 07:08:25 +00:00
Eike Ziller
3592106cc5 Debugger engine: Remove unused QActions
The debugger engine had actions for starting an engine, that were
created but never actually used.

Change-Id: Iaae534587514d98611c53dc649ddb537ed7f7053
Reviewed-by: hjk <hjk@qt.io>
2018-10-25 07:04:04 +00:00
Thiago Macieira
030901a743 Fix build with Qt 5.12: fully-qualify base class
Without the full name, moc will generate invalid code. This will happen
for any base class whose name exactly matches the namespace it is in,
because in

  struct A : public B::B

inside class A, B is the injected name of the parent class, not the
namespace, which in turn means B::B is the constructor.

Change-Id: If7e743cf8476463880ccfffd155f3f51aa29e8b9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-25 05:52:36 +00:00
Christian Stenger
1b231d1dc6 Tests: Fix linking without lib tooling
Change-Id: I51110089b1bed337de54dfa7167b2a5aff761837
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-24 15:30:51 +00:00
Tim Jenssen
2bfe4bbf06 QmlDesigner: use better settings names
The name is better and we avoid problems if the default was
saved by wrong old code which is fixed in the current code.
(The fix does not save the path if it is the default path)

Change-Id: Ifd1d4fc7931fed976de12e3e256915458ffc762a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-10-24 14:10:35 +00:00
Christian Kandeler
e0acdaf191 Fix warning about duplicated messages in qtcreator_uk.ts
The file was edited manually, as the C++ file no longer seems to have
the duplication, and lupdate produced too much noise.

Change-Id: I96f186bee16fcd39711e6beaa9c375d5ce3d26f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-10-24 14:08:12 +00:00
Eike Ziller
0a27156f95 Fix build after merge
Change-Id: I858f294b20c8cf6bcf29a076e5b044119c0b109b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-24 13:10:51 +00:00
Nikolai Kosjar
110fb7943e Clang: Remove pointless function
Change-Id: Ia4239f5b2aa1cfdd515ec0ff43fc10cb49c6f335
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 12:52:22 +00:00
Nikolai Kosjar
f1290da3cd Clang: Avoid running pointless UpdateDocumentJobs
Opening a document (without typing in it), switching away and back to it
resulted in running UpdateDocumentJobs for that document for nothing.

As for documents we are going to reset, simply set opened documents
initially dirty.

Change-Id: I8edc2d1fb8f6f92950b4e2067f60609176bd5b26
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 12:52:14 +00:00
Nikolai Kosjar
aac1bebace C++: Fix parsing enum specifier II
This amends the obviously wrong
de975aca4f, which did not honored nameless
enum specifiers.

This fixes e.g. "Find Usages" for declarations following "enum {};".

Change-Id: Id98c074156f576b9a63e6c25dab38721ca34e496
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 12:47:03 +00:00
Vikas Pachdha
623294cd38 Android: Fix Android SDK license dialog text
Task-number: QTCREATORBUG-21374
Change-Id: I33a145498d514a47028123639bb0808fc714d371
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-24 12:37:33 +00:00
Ivan Donchevskii
918713a059 ClangFormat: Make more readable helper functions
Change-Id: I25828a17104a778d4be156bf2a2879cefbd08691
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-24 12:23:49 +00:00
Leena Miettinen
075ead9cd9 Doc: Add info about setting the -j option for parallel builds
...on Linux and macOS

Change-Id: Ica8a4714a1f1fa50200613c02b174ae3cc53810c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-24 12:07:10 +00:00
Eike Ziller
fd7cba88ef Merge remote-tracking branch 'origin/4.8'
Conflicts:
	doc/src/editors/creator-only/creator-code-pasting.qdoc
	src/plugins/android/androidbuildapkwidget.cpp

Change-Id: Iea8b7135643d14ffe49d10b14bedb8fa5ac48063
2018-10-24 13:58:45 +02:00
Eike Ziller
d1430c9542 Merge remote-tracking branch 'origin/4.7' into 4.8
Change-Id: I6780d8103a88e31f42c674a96d0f6bcbba16e4bb
2018-10-24 13:39:21 +02:00
Christian Stenger
03fece349b Tests: Fix plugin path for macOS
Change-Id: I085ddbbff09d52878b82f311381c13b94739e84c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-10-24 11:19:46 +00:00
Robert Loehning
f633801790 Clang: Remove superfluous white space
Change-Id: I4a37e18ca18c673ab5d0906ebb59823baa1b2879
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 10:25:24 +00:00
Ivan Donchevskii
353cc0e5f3 Clang: Fix the completion fix-it wording
Change-Id: Ifc3ab9946caf3716681a1bffd590f0780b796176
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-24 09:45:23 +00:00
Robert Loehning
a81f8dd0e1 Clang: Use multi-arg version of arg()
Change-Id: Iaaf95ea7a8057a66f044ece79c9b40ecd825d59c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 08:41:50 +00:00
Alessandro Portale
12d8f7e3af CppTools: Bump llvm.org docs link to version 7.0.0
Since we now ship clang 7 binaries, let's open the docs accordingly in
the browser.

Change-Id: Idfd8967fbbadfee87df6f7e721e1ee13ea15de87
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-24 07:07:03 +00:00
David Schulz
eda77dca70 LSP: Add missing argument to initialize error dialog title
Change-Id: I509a06d61de591d0fd576694cfa543b4ffee0458
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-24 06:18:57 +00:00
hjk
bc5e640a46 ProjectExplorer: Use a data member for BuildStep::runInGuiThread
Change-Id: Ia219fcf595c05c6f1b82f420454bd906c6870ee7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-23 15:38:43 +00:00
Christian Kandeler
94e3412365 Give the user a hint as to how increase the output window limit
... if we have to cut off the output because the maximum amount of
characters was reached.

Change-Id: I764c0a3ac555f30d5bce5f3a1b709eec5d2ae94b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-23 14:46:54 +00:00
hjk
5ebab9cd35 ProjectExplorer: Allow tool tips for bool aspects
Useful e.g. for Boot2Qt::PushToDeviceStep

Change-Id: I41f4a52ee7d3b0f18df8b2249232cfd0e4445ced
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-23 14:12:53 +00:00
hjk
0f5d5dbfe4 ProjectExplorer: Make BuildStep::immutable use a data member
Default to false, remove all no-op reimplementations.

And rename the getter to isImmutable according to the rules.

Change-Id: I8cce79d88fb59badfa1cffcf30a46f7ff3b09e8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-23 14:12:39 +00:00
Robert Loehning
cf2ea1b70a Valgrind: Use multi-arg version of arg()
Change-Id: I729641e829ccbd604ea8bb3e45a5425bb83e1a1b
Reviewed-by: hjk <hjk@qt.io>
2018-10-23 13:53:13 +00:00
Nikolai Kosjar
5601ac2952 TextEditor: Fix requesting more proposals than needed
Since

    commit d61d29cf16
    Introduce a basic client for the language server protocol

extra proprosals were requested in the fragile case on a change
notification, e.g. for function signature completion. Restrict this to
the language client proposal, as it was actually intended.

The language client does not support prefixes, so introduce this concept
for deciding whether to request new proposals or not.

Done-with: David Schulz
Change-Id: Ibc1ad82dbeeea93b85f279c59b8c7289fe6ec726
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-23 13:10:52 +00:00
David Schulz
a775c9fddc Debugger: set disabling/enabling subbreakpoints with cdb capability
Change-Id: I11a35394b9aabaaf58a99e800c1ba0f7d58c5e9c
Reviewed-by: hjk <hjk@qt.io>
2018-10-23 13:00:02 +00:00
hjk
8471ce4331 Autotools: Simplify make step setup
The extra inheritance level is not needed (and used nowhere else), and
all special default arguments can be determined from the kind of build list.

Change-Id: I5ab9987d7b1fd8e5999b7c4c8796c2c24db03821
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-23 12:21:28 +00:00
Robert Loehning
0f92d27e2a LSP: Use multi-arg version of arg()
...and remove pointless white space.

Change-Id: I2b737058ad6c598b8d8034a7a05c29a6d629dbac
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-23 12:04:54 +00:00
David Schulz
08e27a5542 Debugger: Do not use deprecated bp model id to construct response ids
fixes breakpoint deletion

Change-Id: Ie5bda4e2664338ad4210f275abca374c6918753c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-23 11:57:21 +00:00
Christian Stenger
6796839da3 ProjectExplorer: Fix test
Change-Id: Iac8e6a74543f5ad19f91dc42c0fc666890f114fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-10-23 11:56:57 +00:00
Nikolai Kosjar
85fcd67538 .gitignore: Add /src/libs/botan/build/
Change-Id: I0eae7749e996208c44ce48531dfc0d0fc92de2a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-23 11:42:21 +00:00
Robert Loehning
29978ceac0 AutoTest: Generate string properly
Word order might be different in other languages

Change-Id: If0f02ab768529887904a4cbed379d3061b9b659a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-23 11:23:17 +00:00
Christian Stenger
5224e824ae Utils: Decrease default maximum history size
History completer has been used now in various areas
and storing 30 items for each of them inside the can
grow the settings quite a lot.
Limit the default to a sensible value - if one of the
history completer needs a higher maximum this can be
raised from the using code.

Change-Id: I5b0bdaa74c1be29f981593f840d5605b75bd17c5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-23 10:44:25 +00:00
Robert Loehning
d3cc6db57b Debugger: Move HTML out of translated string
Change-Id: If62850c782feb73ed469f6aa6e57ad2bc34006bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-10-23 09:54:18 +00:00
Eike Ziller
66ed57ce3e More change log for 4.7.2
Change-Id: I96f8678b0f0658aa72689fcefa410c5e26af50e9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v4.7.2
2018-10-23 09:33:48 +00:00
Robert Loehning
4032f6383a Fix frequent typo
can not -> cannot

Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-23 09:30:20 +00:00
Robert Loehning
7ae7f921ab Android: Move HTML out of translated string
Change-Id: Id5ec3ef43fec1d81b6a9e976732d58ab6f6a461d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-10-23 09:29:59 +00:00
Eike Ziller
b605ad61bc iOS: Work around mismatch of USB serial and iOS device id
Currently we track connection of devices in the iOS plugin via USB,
using the USB serial number as a device identifier (iosdevice.h/cpp).
On the other side, iostool uses the MobileDevice framework to identify
iOS devices (iosdevicemanager.h/cpp).

The assumption that the two identifiers are the same seems to be no
longer true with the iPhone XS devices. These have a device identifier
that contains a dash that is not present in the USB serial number.

As a hotfix, just remove any dashes from the identifier on the iostool
side because we only use it for the lookup deviceId -> AMDeviceRef
anyhow.

The longer term fix should be to use MobileDevice framework for the
connection tracking of devices on the iOS plugin side as well, instead
on relying on questionable assumptions.

Change-Id: Iac3115a1c3f43a4f9e159aaa4ded1c671c55d888
Fixes: QTCREATORBUG-21291
Reviewed-by: Jason Hihn <jhihn@gmx.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-10-23 09:17:35 +00:00
Christian Kandeler
29f64ea2fa SSH: Add missing check in key exchange reply handler
We claimed to support the diffie-hellman-group14-sha1 protocol, but
forgot to actually handle it.

Change-Id: I3193997d7270328700486a15a6281ebf8528ed56
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-10-23 08:29:23 +00:00
Christian Kandeler
1c6c64df20 SSH: Turn some manual tests into autotests
Change-Id: Id098709ff74dfc31a26ef42d559ce35d0120c0c3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-10-23 08:28:55 +00:00
Leena Miettinen
4599a9b433 Doc: Describe changing default editors in MIME type settings
Change-Id: I8d9b9400932c564248f5b654cc72c4c794c778ec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-23 07:18:25 +00:00
Nikolai Kosjar
cfbf2559f4 Clang: Fix naming conventions for *ModelManagerSupport* classes
We use "Builtin" and "Clang" as prefixes, not suffixes.

Change-Id: I6926aeb8f005176ef420c4421c257e3df61ee0b7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-23 06:12:29 +00:00
Eike Ziller
e3021b7178 Fix crash in folder navigation widget
We want to delay updating the crumble path, but we may not keep and pass
around the QModelIndex, since that can become invalid.

Change-Id: Id0c1ffb046dda1fb3bc09801fd1952787f9919fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-23 05:46:25 +00:00