Commit Graph

52078 Commits

Author SHA1 Message Date
Eike Ziller
72e9afd8d0 Fix underline color in diff description when hovering
Since e.g. whitespace can have a different foreground color than
"normal" text, we have to explicitly set the color for the underline
when hovering. Use foreground color if there is no specific text color
set for "normal" text.

Change-Id: I9825d24af0d598b039a0db9ed86966605e22ac04
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2017-07-10 07:17:19 +00:00
Jake Petroules
4196534759 Fix the deployment target problem once and for all
Instead of hardcoding the value of LSMinimumSystemVersion in Info.plist
where we will always forget to update it (and since Qt Creator can be
built with multiple versions of Qt, it will almost certainly be wrong
for one of those versions), automatically determine the value from
QMAKE_MACOSX_DEPLOYMENT_TARGET, which is authoritative.

This should prevent mishaps where users try to run Qt Creator on older
OS versions and receive a crash dialog instead of the friendly "This
app requires a newer version of macOS" message that a properly set
LSMinimumSystemVersion value will induce.

The Qbs build is not affected by this problem, as Qbs automatically
handles the minimum deployment target even when a custom Info.plist is
specified.

The solution chosen in this patch was used instead of QMAKE_SUBSTITUTES
because the Qbs build also uses the Info.plist input file and it would
break the Qbs build if the quotes were to be escaped, since it would
become invalid XML.

Change-Id: I20625a2fae546c6597a567f28864b12917e8ac39
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-07-07 17:50:02 +00:00
Jake Petroules
b80d5c1c95 Qbs: fix bundle installation with Qbs 1.8
This patch also sets the minimumQbsVersion to 1.7 because that's the version
that is actually documented as being required in the README.

Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-07-07 17:28:33 +00:00
hjk
e829ca8e31 FakeVim: Fix gt/gT/:tabnext/:tabprevious
The mapping was there, but not connected to the core actions.

Change-Id: I9faa1c47afe409caaa0462740a6865d99d959b44
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>
2017-07-07 15:31:18 +00:00
hjk
eb0aa0b76f Debugger: Connect GdbServerPortsGatherer signals in constructor
Not in start(), when it would add extra connections on each re-run.

Change-Id: I5fe9e047a188276f3bde54227dc0509ab77366c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-07 14:55:27 +00:00
hjk
9c738cea42 ProjectExplorer: Remove RunControl::notifyRemote* function
As promised in 112e32228. The temporary workaround can go now.

Change-Id: Ia98abfb21577ff073b069eaaf0edb5fb1227114d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-07 14:42:47 +00:00
hjk
8f1f333004 Debugger: Use a SimpleTargetLaucher for gdbserver
Makes remote output appear again in the Application Output pane,
and is arguably the right thing to do anyway.

Change-Id: I05c365eec43f60a85482b8ae7d5856b3a31ee6f8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-07 14:36:39 +00:00
Leena Miettinen
e2becd2b0b Doc: List supported FakeVim modes and emulated commands
Change-Id: I9fe1f0982829aa4e5998f03f098bef7679b44443
Done-by: Lukas Holecek
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>
2017-07-07 14:14:51 +00:00
Eike Ziller
3188a5abb1 Fix style of whitespace in diff description
Task-number: QTCREATORBUG-9445
Change-Id: I1c60181b7e15c66b88cc1d5ec7584951d3aa46a0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2017-07-07 13:27:37 +00:00
Orgad Shaneh
c04569a04d FancyMainWindow: Disregard accelerators when sorting docks
Change-Id: Ib21a62152008a0b428f93a58d32685e2c0b0dc3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-07 12:32:04 +00:00
Orgad Shaneh
c841dc551c Introduce and use Utils::stripAccelerator
Change-Id: I8c37728ca5de20e2b68e6d0ac7fc120baa696040
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-07 12:17:40 +00:00
Kai Koehne
510a00ea35 Hide "?" button in plugins dialog
Change-Id: Icdfe9a58a0b0c0d5773c2c5a0d433ea903e66138
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-07 11:14:06 +00:00
hjk
8376afd9d7 ProjectExplorer: Remove RunControl::worker<Type>()
It looks like the case where workers need talk to each other by
only knowing the type of the 'partner' does not exist in practice
anymore. With the now-common setup of a 'primary' worker that one
can introduce the 'lesser' workers to each other directly.

That's also conceptually more robust that picking a partner by
type only only from some 'pool' (all the workers in a runcontrol),
scales better (it e.g. is imaginable that a RunControl needs
more than one PortGatherer in complex setups where more than one
device is involved) saves a few cycles, and even removes the need
for workers to be qobject_cast-able.

Change-Id: Ib3d8c942c893d6c198d9813cce7df28ba3260ce8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-07-07 10:56:25 +00:00
Christian Stenger
2cacf24b18 Dumper: Fix exception when accessing empty items
This also fixes accessing 'this' when located inside a
different thread.

Task-number: QTCREATORBUG-18466
Change-Id: Ib90cc23c65c033a234d3f7cf9b1ba76abff719e2
Reviewed-by: hjk <hjk@qt.io>
2017-07-07 09:38:10 +00:00
Christian Kandeler
8f57264742 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I9318013728c25e18f2dbf60aa408e0fe75b095d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-07 08:35:53 +00:00
Orgad Shaneh
2dc906961e RunConfig: Do not log debug messages to output pane
Looks like this was done for debugging, but the user is not supposed to be
aware of internal implementation.

Change-Id: If24a2b0f85a04c2e88c5ef5fd66d34a606d46712
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-07 08:21:31 +00:00
hjk
f82bb1ec3a ProjectExplorer: Remove Connection as concept
It turns out that one "Connection" per RunControl doesn't map
well to the uses we have. Instead, RunWorkers need to know
individually how to connect to the place where they can work,
but they are already specific enough to be able to use a
standard class (like QUrl) as their way to specify the needed
entry point.

In theory one could see a RunControl's connection as an
aggregation of its workers connection bits, but that does
not really seem to be needed in code.

As consequence, replace UrlConnection by a plain QUrl, and also
the HostName connection by a QUrl with hostName set.

Change-Id: I40c97e37779314ac0a77041e864a18eadb78f987
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-07 06:23:52 +00:00
Orgad Shaneh
72775ab8c4 Debugger: Add missing state cases in quitDebugger
* Aborting a core dump debugging is a valid state
* Do not try to abort more than once (happens on shutdown)

Change-Id: I075409b3fa1231420fcd72706b18eaa0383fd4f2
Reviewed-by: hjk <hjk@qt.io>
2017-07-07 06:16:20 +00:00
Eike Ziller
85da204e12 Fix mouse usage of locator popup on some systems
The logic to not hide the popup if it got active was lost in
e133ee8928

Change-Id: Ic3af147194f7ad18d510e827db1d5804e48e1f97
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-06 10:18:52 +00:00
Eike Ziller
fe7ec24982 Fix size of locator popup
The item delegate's sizeHint will only be correct after there are actual
items to show. So behave similar to uniformRowHeights by waiting for the
first data to arrive and then setting the size of the completion list
and the popup.

Task-number: QTCREATORBUG-18457
Change-Id: I7aa18988e07e21c2ec6587e83fb0de2dce6552ef
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-06 10:17:50 +00:00
Christian Stenger
7c6c808486 AutoTest: Fix condition for finish message
Slipped in with cc8bff67.

Change-Id: I02968395cf3ac5671326d874e5c58fef944225a9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-06 10:04:50 +00:00
Marco Bubke
608b157247 Clang: Disable lib tooling for unsupported versions
We do only support version 3.9 currently.

Change-Id: I3ecb2dbb56a2990e401ce6cf485f8e3a910fede6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-06 09:28:54 +00:00
Nikolai Kosjar
f51d7a2314 C++: Fix crash for invalid code
...due to indirect recursion:

  ...
  CPlusPlus::ClassOrNamespace::lookupType        LookupContext.cpp 833  0x7fffd6c954cc
  CPlusPlus::ClassOrNamespace::nestedType        LookupContext.cpp 1364 0x7fffd6c94bc6
  CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 955  0x7fffd6c9517f
  CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 983  0x7fffd6c952ad
  CPlusPlus::ClassOrNamespace::lookupType        LookupContext.cpp 833  0x7fffd6c954cc
  CPlusPlus::ClassOrNamespace::nestedType        LookupContext.cpp 1364 0x7fffd6c94bc6
  CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 955  0x7fffd6c9517f
  CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 983  0x7fffd6c952ad
  CPlusPlus::ClassOrNamespace::lookupType        LookupContext.cpp 833  0x7fffd6c954cc
  ...

ClassOrNamespace::lookupType(const Name *) already guards with a list of
entries already processed, but some calls deeper the list is not passed
on and lookupType() starts again with an empty list. Handle that case,
too.

Task-number: QTCREATORBUG-18499
Change-Id: Iab8978f6ac1d0aea16f49b3547415f43de887b07
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-06 09:18:39 +00:00
Thomas Hartmann
89e3262edf QmlDesigner: Support Qt Quick 2.9
Change-Id: I784584806819eb667cb596e1d46ffe9b393087fd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-06 08:43:53 +00:00
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
3b8362d0c4 Use 4.4 branch from binary artifacts
Change-Id: Id0e016d782f28a61422b9138a862c398b791be2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 18:50:21 +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
Eike Ziller
cfb5f610a1 Update binaries' supported macOS
Change-Id: If51b0395b509c8e943688a9f00352b4ac5800369
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-07-05 14:33:59 +00: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
hjk
1a16caf221 Debugger: Don't list static members of items in arrays
To properly access a static member we need a nativeValue which we
don't have in the expansion of an array.

Not showing static members in that case is a compromise between
LLDB behavior (never show statics) and showing something wrong
(see the linked bug report)

Task-number: QTCREATORBUG-18366
Change-Id: I688779224a89d4ecbc47dd5623922efb32be9c4c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-05 08:17:42 +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
Nikolai Kosjar
f257e3fe95 Clang: Fix ReferencesCollector tests on Windows
This is supposed to fix

  [  FAILED  ] ReferencesCollector.VariableInTemplate
  [  FAILED  ] ReferencesCollector.MemberInTemplate

on Windows.

Change-Id: I1a6486e524069c83da183e3e68df2dea8ba415ff
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-04 14:40:30 +00:00