Commit Graph

54723 Commits

Author SHA1 Message Date
Thiago Macieira
d6b6a88753 Debugger: print QFlags and bitfields as hex
It's a lot more useful to see in Qt Creator:
  QAbstractFileEngine::FlagsMask (0xff00000)

Than
  QAbstractFileEngine::FlagsMask (267386880)

Change-Id: I8d96dea9955d4c749b99fffd14cd690574b433e5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-11 23:57:19 +00:00
Orgad Shaneh
d294f91758 main: Remove unused variable
This amends commit a6c17fc537.

Change-Id: I365513a9e11e6c07310799f87a4e299cd110dcf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-11 20:28:26 +00:00
Orgad Shaneh
2a197ed9bf Revert "App: (Re-)enable automatic HighDPI scaling for Linux"
It breaks running over PuTTY with VcxSrv.

This reverts commit 36c8227caf.

Task-number: QTCREATORBUG-18467
Change-Id: Id93497ee24cdb574d1e4a1ac1b0fb112012a695d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-11 20:28:14 +00:00
Jochen Becher
05f7b92f0a ModelEditor: Introduce QMT_ASSERT
This change shall solve a lot of Coverity findings

Change-Id: I1e699f7363426e9b6008fc77d3f498fe3d968b4f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-11 20:17:55 +00:00
Jochen Becher
8ccdbe1944 ModelEditor: Satisfy Coverity using Q_UNRECHABLE
If I remove the switch cases gcc produces a warning. Coverity recognizes
the cases as dead code and produces a finding. Maybe Q_UNRECHABLE is
modeled in Coviery to suppress dead code issues.

Change-Id: Idae2c088ba95b3e00cb4ef788d075fe7e0d4b6a5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-11 20:17:46 +00:00
Jochen Becher
706b0874f5 ModelEditor: Fix a number of trivial coverity issues
Change-Id: Ie61e017b993ac788284611fb40052e5f59521a56
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-11 20:17:28 +00:00
hjk
0d06dbb5b2 BareMetal: Dissolve BareMetalRunControlFactory
Less code.

Change-Id: Ie3bd75557e4f4b5acff65a9b3a074692ea652253
Reviewed-by: hjk <hjk@qt.io>
2017-07-11 16:06:08 +00:00
Hannah von Reth
ada1429594 Introduce setPerspectiveEnabled
This enables us to mark perspectives as disabled.

Change-Id: I52b2434f33f8550b6d2459f915dfd8cdb1389140
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-07-11 15:38:49 +00:00
hjk
82f8cb70e6 WinRT: Dissolve RunControlFactory
Less code, and it's what most other targets do nowadays.

Change-Id: I2cf55d1a32ad10427ce2508536d03bca8921b451
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-11 14:57:16 +00:00
Ivan Donchevskii
550ed2927d C++: fix lookups for functions with const args
Make declarations equal in case they differ only
by argument const and/or volatile (13.1.3.4).

Task-number: QTCREATORBUG-18475
Change-Id: Id0561fda3b9081b92716a8739ba9963e90b5d709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-11 13:38:56 +00:00
hjk
20b6ccd23b Locator: Add a virtual destructor to BasicLocatorFilterTest
Change-Id: Ic5947003945d4cfc87484106052e98e06e4e700a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-11 12:54:07 +00:00
Tim Jenssen
429163ea1e Qmljs: fix a crash when m_treeview is deleted
Change-Id: I3743815c14151b49784a20cdb0c0bba2fbde4e7b
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-11 12:30:07 +00:00
hjk
e9718b253a Debugger: Partially dissolve DebuggerRunControlFactory
Aspect creation must stay for now as the object pool is the only
central registry for it right now.

Change-Id: Ibe42009db6b0351aaa36e9ac8f0f6f7a0562167e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-11 11:10:44 +00:00
hjk
6f0a600bcf Debugger: Streamline error string handling
Let the workers keep track of errors instead of passing around
string pointers in some but not all interesting places.

Change-Id: I3956bc947a50747dd3a0c9302b9f9873d192e9c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-11 10:53:00 +00:00
Tobias Hunger
53c85a2676 Project: Use more std::unique_ptr
Change-Id: I06114e79b0a5b58b3dc4d13279232392709e9efc
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-11 09:54:18 +00:00
Robert Loehning
8637d04c1d Squish: Update expected text in tst_git_local
Change-Id: I97a532f80b9dc2b40ec5931116b207cfaeef8f4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-11 09:20:27 +00:00
Robert Loehning
8c66ecfaa3 Squish: Expect wrong popups to be fixed
Task-number: QTCREATORBUG-15710
Change-Id: Id4a0e3e42249cdd281ed79b0914faacfb3450e37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-11 09:20:06 +00:00
Robert Loehning
29504197d7 Squish: Handle "Fixed" status in workarounds
Change-Id: I0df22407e19a71a4ab216d413ce682a793287aa3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-11 09:19:26 +00:00
Jake Petroules
091ae3db31 Remove the last usage of deprecated Carbon APIs from Qt Creator
Change-Id: I05c8345e5f1618e7ecbb8a9c27feb5b9a321dc11
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-07-10 16:49:11 +00:00
Christian Kandeler
3b956976d7 QbsProjectManager: Fix qbs build against installed qbs
Change-Id: Icfe86b98ab8162fe613dbf089fec1692c5d3dbea
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-10 14:14:14 +00:00
Ivan Donchevskii
287ae7ae61 Completion: improve complete in the middle
Apply clang fix to the old code model
Do not replace the text after cursor if
the proposal does not contain it or
if proposal matches 100% the text after it

Task-number: QTCREATORBUG-18471
Change-Id: I662cb6e48a9e0ee14065594f5c823f114fff2474
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-10 13:52:18 +00:00
Nikolai Kosjar
e1de989e16 Clang: Show inline diagnostics only for project files
When navigating to headers that are not part of the project, avoid
showing the inline diagnostics. In most cases, these files can't be
changed.

This helps also for the session-load case where files are opened/parsed
when no project information is available yet.

Change-Id: I7fce24af78b3b1efbf64dd27d8ca2a053e02d4ec
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-10 12:32:07 +00:00
Christian Kandeler
dc1bdc9bec qbs build: Adapt to renamed Qt.core property
Change-Id: Ie05ad37ae7711a6deb152c5aa0a926e9b83b082b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-10 11:51:46 +00:00
David Schulz
4b787386ae Debugger: Fix detection of the latest cdb in qbs builds
Change-Id: Idd0115937c6db36f64087f49c116339f291bfcd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-10 11:09:28 +00:00
Eike Ziller
c363c1d4ee Add locator input widget to help windows
And move the "Show Sidebar" button into the status bar that we
need now anyhow.

Change-Id: I24bfa0991cbdcdba4d1a8cd6cbacde28d459972d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-10 09:58:02 +00:00
hjk
acc86aee5a ProjectExplorer: Move re-runnable decision to RunWorkers
A RunControl is re-runnable if all its workers are,
a RunWorker is re-runnable if it's Stopped and unless it
says otherwise.

Also ensure SimpleTargetRunner only reportStop() once
per run and make process error message re-usable.

Change-Id: I73f5fb724d3026ceb81d5e32a3a71b4814b2bca9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-10 09:02:17 +00:00
Marco Benelli
6c41fafbb6 Qmlpuppet: add missing includes
Task-number:  QTCREATORBUG-18498
Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-07-10 08:48:46 +00:00
Tobias Hunger
19c9194b11 VcsManager: Register IVersionControls with VcsManager
Get some more objects out of the pool.

Change-Id: Id93021b712307c4777dc39b9d15aa18a46318885
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 08:44:47 +00:00
Vikas Pachdha
34dad7e3a3 iOS: Enable sorting for simulator listing
Task-number: QTCREATORBUG-18512
Change-Id: I4713165f131894bd9b881d8de25ff1e8a1a39e51
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 08:44:25 +00:00
Tim Jenssen
9a4394fa2d VcsManager: Simplify caching
Use value types in the cache and remove the code used to manage the
pointers.

Change-Id: I3babc69d571de161e161037da7cd731f70d0695d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-10 08:38:36 +00:00
Orgad Shaneh
a78fd02574 Debugger: Do no warn when debugging with MinGW
Change-Id: Iee9cc2232c002ea960f05848df02ac0658017911
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-10 08:22:18 +00:00
Tobias Hunger
74c1ebdcaa VcsManager: Simplify usage of clearVersionControlCache
Change-Id: Iaf2f65da31a33979c30e63c29a706a568cc5fd1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 08:21:42 +00:00
David Schulz
671e3eba3d TextEditor: Use a constant offset for the annotations
Do not check whether a refactoring marker is visible, but always provide
enough space to display one.

Change-Id: I3f9dbb973b9067bd8177773d6fc878b47427232e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-10 08:19:27 +00:00
Jarek Kobus
323bee675a DiffEditor: make some public methods private
Change-Id: Idb7a506e81001fda79eff72c0c23b9945103cad0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-10 08:19:05 +00:00
Eike Ziller
3158981e9d Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qtcreator.pri

Change-Id: Ibb67815f6bb33a4c5ddc33b71f9c436624685e11
2017-07-10 09:59:56 +02:00
Alessandro Portale
e2ad4c282d TextEditor: Simplify the overlay selection path
The algorithm that creates the overlay selection path adds many
redundant curve elements. That is quite ineffecient when painting and it
also creates visual gaps.

This patch simplifies the path and therefore substantially reduces the
elements and removes the gaps.

Task-number: QTCREATORBUG-18518
Change-Id: If3558e226825426ca6b143eeba4239e6f0061df0
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-10 07:59:07 +00:00
Eike Ziller
345ea0307c Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
	qtcreator.qbs

Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
2017-07-10 09:54:52 +02:00
Orgad Shaneh
491ab37b1f Beautifier: Show version in command tooltips
Change-Id: I897ac7ed45ff50a7dfd7c1c7c5abd8ad417f84af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 07:44:06 +00:00
Orgad Shaneh
e49ccd0747 Beautifier: Minor cleanup
* Use initializer list and Utils::transform
* Remove unneeded override

Change-Id: I36ff9b9900fa6169ed1529bbbbdba13075353332
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 07:42:31 +00:00
Eike Ziller
6b0d9f7047 Locator: Fix data processing from multiple filters
The tree view uses a connection to rowsInserted internally for updating
the view, so we may only remove our specific connection to updateSize.
Otherwise the view stops showing items after the first rowsInserted.

Task-number: QTCREATORBUG-18522
Change-Id: Ib80fa39ee5556221a447db3556495a3608e3f62b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-10 07:37:07 +00:00
Orgad Shaneh
af98652215 Debugger: Fix core dump with project from command-line
Change-Id: I223dc3c00aa7d4b2cda743a9292272387177ed93
Reviewed-by: hjk <hjk@qt.io>
2017-07-10 07:36:25 +00:00
Orgad Shaneh
4832f75d53 Debugger: Avoid soft assertions in register list values
Change-Id: Ia5444b935c964fd450bed67306dc10ed9d54e7c7
Reviewed-by: hjk <hjk@qt.io>
2017-07-10 07:35:11 +00:00
Orgad Shaneh
267b0431e2 Debugger: Fix typo
Change-Id: I1ef2db7ce7546118d68925708dc2c1573653417c
Reviewed-by: hjk <hjk@qt.io>
2017-07-10 07:23:52 +00:00
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