Commit Graph

57214 Commits

Author SHA1 Message Date
Alessandro Portale
901b2be036 HelpPlugin: Modernize
modernize-use-*

Change-Id: Ie0058675c1336377326089dbc093436130f1fe03
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-12 11:10:38 +00:00
Orgad Shaneh
644110f6e0 Git: Block [*_]HEAD for branch name
Can have false positives, but I think it's better than tracking all of
git's internal names.

See https://stackoverflow.com/a/17596689/764870

Change-Id: Ifa3d942c4f791e5f8542e0cc174b934f2a95cbcd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-11-12 09:48:52 +00:00
Orgad Shaneh
92431932e3 Git: Show detached HEAD in branches view when applicable
Fixes: QTCREATORBUG-21311
Change-Id: Ia4297d23a965d83ea2814bd1e41f35a3017b8e9b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-11-12 09:48:25 +00:00
Orgad Shaneh
e0a1b171f1 SerialTerminal: Show error string on connection failure
Change-Id: Ie951d9598358ef87ea50d6b748b1a88d3ba5431d
Reviewed-by: Benjamin Balga <balga.benjamin@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-11-12 09:48:03 +00:00
Alessandro Portale
ce1fe8f513 HelloWorld: Modernize
modernize-use-*

Change-Id: I8b53d86b48f3b5c15e6967dd450b814a90987ac1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-11-11 14:40:28 +00:00
Orgad Shaneh
1ef39405a4 Git: Pimpl BranchModel
Change-Id: I18b7fae8b47b449cf1f049a466efb6a1fbb7e522
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-11-11 11:57:52 +00:00
Alessandro Portale
3b6f45a7a3 Git: Modernize
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Iaccd5611cfc2056d357a0545f8522f02d6f8f0ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-10 21:03:01 +00:00
Orgad Shaneh
96529a27c5 VCS: Add reason text when submit validation fails
Change-Id: If4c8d5d1d5dc5386e49b29be59786dc53cfaaaa3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-11-10 16:05:05 +00:00
Eike Ziller
3666e3aaeb Merge remote-tracking branch 'origin/4.8'
Conflicts:
	tests/unit/unittest/unittest.pro

Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593
2018-11-09 13:30:40 +01:00
Christian Kandeler
dc82e49b62 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: I224615cf50ca78aa9125daf3a3907734071bb1e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-11-09 12:16:32 +00:00
hjk
3cef77db86 Debugger: Ignore bogus signal number on QNX
Fixes: QTCREATORBUG-21351
Change-Id: Id2b45e830f860a9352aacbbd5f6932d8fcde7b26
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-11-09 11:33:42 +00:00
Sergey Belyashov
75bba7c420 Update Russian translation
Change-Id: I0cc4238c0ad528be8cbb5cc8236348cc47b8188d
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-09 09:24:36 +00:00
Alessandro Portale
e5da4a791c Debugger: Use the toolbar version of start debug icon on the toolbar
Change-Id: Iac38599ead4851f5aac978d7484f0b230809f7ac
Reviewed-by: hjk <hjk@qt.io>
2018-11-09 09:14:45 +00:00
Orgad Shaneh
57de7cabdf ClangFormat: Fix unused static function warning
Amends commit 0e5c7f51fa.

Change-Id: I4beb8219828cbf7d02677e724bee41abdf0d7fef
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-09 08:58:58 +00:00
Ivan Donchevskii
8469e317c9 Utils: Adjust column numbers affected by convertPosition change
convertPosition change was introduced in 931ec39f64.
It changed 0-based column to 1-based which is how it
naturally is in Qt Creator.

This fixed some usages but broke many more. This is an
attempt to fix the remaining use cases.

Fixes CppEditor auto-tests.

Change-Id: Ia8d14da0ebb035cd2fdd6da4ff6ec89c1c5121a8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-11-09 08:51:21 +00:00
Ivan Donchevskii
3d93945840 ClangFormat: Add missing file to .qbs
Change-Id: I387da659355ee53563f6708781099f90da0e6266
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-11-09 08:50:21 +00:00
Eike Ziller
d58c0a9ac8 Work around crash when dragging text from tool tip
Disallow text selection for the code model tool tips because dragging
the selection somewhere crashes.

Task-number: QTCREATORBUG-21430
Change-Id: I3aed4e16bf429162258d2dfafaa45fff25ba700a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-11-09 08:42:44 +00:00
Nikolai Kosjar
c0a1683de3 ProjectExplorer: Whitelist -Bprefix for header path search
Fixes: QTCREATORBUG-21424
Change-Id: I36b1e91c86714a9c1b54a6c5a6fe1b24de7878f7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-11-09 08:41:47 +00:00
Alessandro Portale
951eb885af GenericProjectManager: Modernize
modernize-use-auto
modernize-use-equals-default
modernize-use-nullptr
modernize-use-override

Change-Id: I67c9895f46efe8646176718949561240c7175c53
Reviewed-by: hjk <hjk@qt.io>
2018-11-09 08:03:13 +00:00
Alessandro Portale
cce6975fd8 DiffEditor: Modernize
modernize-use-auto
modernize-use-override
modernize-use-equals-default

Change-Id: I4e70550ed2962781b62661a405517b5c79126bad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-09 05:40:27 +00:00
Alessandro Portale
df1f975252 FakeVim: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-equals-default

Change-Id: I320a08a99a1d18ab87aec207ec1e03190009b592
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 21:32:29 +00:00
Andre Hartmann
f05f4d304f ExternalToolsFilter: Prioritize results like in other filters
Change-Id: Iea0c8d6b06275f83234778e3bd3ba8cff3c4107b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
2018-11-08 15:53:55 +00:00
Robert Loehning
87332d5c8d Squish: Test initialized refs to smart pointers in tst_memberoperator
Change-Id: I7c48ca5c4d05f4ea36dd82bde3a19a386580452a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-11-08 15:28:38 +00:00
Alexandru Croitor
e74366bbea [Debugger] Add dumpers for QEvent and QKeyEvent
QEvent dumper will now show an additional [type] field with the enum
name representing the event type (aka the value of QEvent::type()).
For example: 'QEvent::KeyPress (0x0006)'.

QKeyEvent dumper will now show a value similar to:
"Pressed 'F' (key:70 vKey:3 mods:Shift)" as the initial non-expanded
value.
A new additional field called [Qt::Key] will show the enum value
of the key pressed, for example: Qt::Key_F (0x0046)

Change-Id: Id91431d0e3d3adeb89d6b74ea341a335ff37efdc
Reviewed-by: hjk <hjk@qt.io>
2018-11-08 15:28:37 +00:00
Alexandru Croitor
de32a631c3 [Debugger] Fix bitfield values to show up correctly using lldbengine
The bitpos value returned by lldb is the bit offset relative to the
beginning of the type, there is no need to do an extra modulus
operation.

Adjust dumper test to add the previously failing case.

The failing case happens when the class containing the bitfield has
more members in front of the bitfield.

Change-Id: I93678f78e6799843558ec53342a0ed49cac74f48
Reviewed-by: hjk <hjk@qt.io>
2018-11-08 15:12:10 +00:00
Marco Bubke
9b1e7e440a Clang: Add BuildDependenciesStorage
Task-number: QTCREATORBUG-21378
Change-Id: Ibcb90239d240653b21f12a7b96a7775e5b0b4319
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-08 14:34:02 +00:00
Ivan Donchevskii
0e5c7f51fa ClangFormat: Synchronize with C++ code style settings
And remove UI for default code style settings because
it does not affect anything when ClangFormat plugin is
enabled.

Change-Id: Ie348b7d2691b09ea2b4868da987f2a27347ea0f3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-08 14:23:06 +00:00
Thomas Hartmann
3de607f4e0 Fix icons
Task-number: QDS-286
Change-Id: Iecf8847248385eedc4b8fb90268038fc82faf12c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-11-08 14:22:16 +00:00
hjk
c016c6737b Debugger: Fix LLDB start with complex command lines
Fixes: QTCREATORBUG-21433
Change-Id: I1a248272566eac7f5fd07a8346500d245b62fbfa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-11-08 14:21:21 +00:00
Ivan Donchevskii
0a29e12d0c ClangFormat: Fix text indentation after inserted snippet
Limit the range of text which is indented to the last
non-empty character inside the block.

Fixes: QTCREATORBUG-21385
Change-Id: If9bc271e7ecf81482cb682efd0f09770e6fa02f5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-08 14:19:01 +00:00
Christian Stenger
ce9b813c37 Squish: Adapt tst_memberoperator to CCM changes
When using the clang code model the operator '.' does no
more automatically change to '->' before applying a proposal.
Instead it points out whether a proposal requires to change
the operator when applying.
So, adapt the test and losen some condition to be able to
keep this test generic and maintainable.

Change-Id: I215fba9bfa98d5d056cd9493d7aa7192fb7a963f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-11-08 13:19:38 +00:00
Orgad Shaneh
136e0f69e4 Callgrind: Avoid an extra call to QDir::entryList()
Change-Id: I22220ccafe64b2eede3ac7d360b8fabe7ccc2b85
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-11-08 13:19:19 +00:00
Nikolai Kosjar
c8c642dde0 Clang: Fix crash when removing diagnostic config
1. Create some Qt Console Application from the wizard
  2. Open Tools > Options > C++ > Code Model
    2.1 Click "Manage..." and create a custom configuration "custom" and
      finish with OK.
    2.2 Set "custom" as diagnostic config.
  3. Analyze > "Clang-Tidy and Clazy..."
    3.1 Use "Custom Settings"
    3.2 Click "Manage..." and remove "custom" ==> Crash

The crash happened because the code model used an invalid diagnostic
config id. The invalid id came from the settings, which were not
correctly upated.

Fixes: QTCREATORBUG-21273
Change-Id: I5242f7c92e121eec8558fa7923139bb3d759c676
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-08 13:14:19 +00:00
Nikolai Kosjar
4a09a6a2cf Clang: Fix reading inconsistent settings
The diagnostic id might not match any diagnostic configuration in the
settings as Qt Creator prior version 4.8 could have written it
inconsistently. We need to correct this case.

Task-number: QTCREATORBUG-21273
Change-Id: Ic9e21f70bca94da6d9afb30f0b2bfd5024d16fdd
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-08 13:13:45 +00:00
Nikolai Kosjar
b52fab502c ClangTools: Fix using clang options of diagnostic config
Task-number: QTCREATORBUG-21273
Change-Id: I2e03954ff2fc866a1f1d00ff250627bee0bbdb7e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-08 13:03:38 +00:00
Marco Bubke
6eb620238b Clang: Refactor FilePathId
We don't need the directory id any more. It's not used widely any way.

Task-number: QTCREATORBUG-21443
Change-Id: Ia95ea4c72fe9530ac56262f61f17faca04d313ba
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-08 12:51:15 +00:00
Andre Hartmann
cbda4d7b9f ExternalToolsFilter: Modernize with range-based for
Change-Id: I69b8ff34c945cf64a99e6b42bd73bc81fed4841e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-08 12:00:24 +00:00
Alessandro Portale
c7c042498b BinEditor: Modernize
modernize-use-nullptr
modernize-use-override
modernize-use-equals-default
modernize-use-using

Change-Id: I1d1381962b3ffd87cbf761f50d8f073068f9a06f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 11:45:35 +00:00
Alessandro Portale
b332fc3182 Bookmarks: Modernize
modernize-use-auto
modernize-use-equals-default

Change-Id: I9c3a854530051ce2b86f7a94f715f8212a1688bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 11:45:19 +00:00
Alessandro Portale
c4b07bf730 ClangTools: Modernize
modernize-use-nullptr
modernize-use-override
modernize-use-equals-default

Change-Id: I14a840c6f2972f57763cdfd4bb4483df1ec261d4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-08 11:40:57 +00:00
Alessandro Portale
5001927425 ClassView: Modernize
modernize-use-nullptr
modernize-use-auto
modernize-use-override
modernize-use-equals-default
modernize-use-using
modernize-loop-convert

Change-Id: I7dcc03ad38f6f943bc4c8b1049e7069f4b99c985
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 10:57:20 +00:00
Alessandro Portale
26686c384f CodePaster: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-equals-default

Change-Id: I3d9fffef3bccc1a64e24acd0846da57b224ba801
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 10:22:59 +00:00
Alessandro Portale
beda0205d1 EmacsKeys: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-equals-default

Change-Id: Icdd470c27bfaef1ff4d8af20103c8d2a22043bbe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-08 10:22:19 +00:00
Thomas Hartmann
d37ec2c1e5 QmlDesigner: Change name of internal property
The new name makes the usage more clear.

Change-Id: I35b0f2636736ec4d86af30ec631ceab9fc636313
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-11-08 09:46:49 +00:00
Thomas Hartmann
81754c161f Update documentation to Qt Quick 2.0
Remove some last Qt Quick 1.0 left overs.

Task-number: QTCREATORBUG-20368
Change-Id: Ic559db21f754fcef6294e1d158e3c35b03851c38
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-11-08 09:10:41 +00:00
Orgad Shaneh
bc9de45213 Callgrind: Use member initializers and nullptr
Change-Id: I5e873e79a36a7bcd88260a3e42d3f66622f69cb4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2018-11-08 08:32:18 +00:00
Daniel Levin
68e780f99d Fix infinite recursion in highlight processor
Highlight definitions might have a case with recursive context call.
Trivial example:

    <context name="foo" fallthroughContext="bar">
    <context name="bar" fallthroughContext="#pop">

This leads to infinite recursion call or infinite while loop in
Highlighter::highlightBlock. Some safety measures should
be implemented, like Kate does.

Implementation should detect recursion call and stop processing current
line. I.e. when iterateThroughRules() was already called with exactly
the same current context and progress->offset().

This patch implements recursion detection in ProgressData instance.

Task-number: QTCREATORBUG-21411
Change-Id: I4e1ba13ce40b7ba0f64ec655f8ce4b6e406ccf97
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-11-08 08:29:50 +00:00
Christian Stenger
d846722264 AutoTest: Move signal emission
... to location where the output gets processed.

Change-Id: I293f1dbd67e4c8969f60305768e1ce5bc8cba063
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-11-08 07:40:12 +00:00
Christian Stenger
1cfaa828a8 AutoTest: Fix outputparser
This patch amends 3056105c66. This patch fixes
handling of output while debugging and appending
to the "real" output if the user interacts with
the output while the test is running.

Change-Id: I1db54382f1df3e2b9a5a860002aac8fb208ee5b9
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-11-08 06:33:09 +00:00
hjk
790a86d508 Debugger: Use a QPointer for the thread switcher
... and (re)create it on demand. That covers the case of a restart
of the debugger engine in which case the original switcher was
destroyed together with the toolbar of the original perspective.

Change-Id: I6180411a37aea46438809a5ff65e5526f9db2a03
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-11-07 15:45:48 +00:00