Commit Graph

57214 Commits

Author SHA1 Message Date
Nikolai Kosjar
db4e7b2224 ProjectExplorer: Fix detection of OpemMP language extension
Regression introduced by

    commit 6aa11eb75e
    CppTools/ProjectExplorer: Remove enum duplication

Task-number: QTCREATORBUG-21213
Change-Id: I76ab42cf0433f437ca08b4582b91afc43b2f85fd
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-16 07:45:35 +00:00
Nikolai Kosjar
fcada78b3f VCS: Remove trailing return type of lambda
Change-Id: Iba1033ed5eaaf68815ac83a91a514845c0f2347a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-16 06:47:53 +00:00
Nikolai Kosjar
d67ddfb5d1 Clang: Avoid starting backend jobs for inactive app and during VCS operations
...to reduce file locking on Windows caused by clangbackend's
parse/reparse jobs.

Considering inactive application state should help for external VCS
operations, e.g. on the command line. However, activating Qt Creator
while such a VCS operation runs might still lead to undesired behavior,
but this should be the less common case.

VCS operations started from within Qt Creator should see less locking
conflicts as we know when they start and finish. However, we just avoid
starting new jobs - there might be still jobs running.

Pending or new jobs will be started once Qt Creator is activated again
and all VCS operations finished.

Task-number: QTCREATORBUG-15449
Change-Id: I5f04c34f006e66162368efbdd58bd822a706f35e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-16 06:40:43 +00:00
Eike Ziller
3f3ba92fe9 Fix debugger "step into" icon
Fix-up of 3b5ecac238

Change-Id: I0c9197e4c1cf62ccdb57710af00189b32c850fd5
Reviewed-by: hjk <hjk@qt.io>
2018-10-16 05:13:09 +00:00
Eike Ziller
511bd64f3f Merge remote-tracking branch 'origin/4.8'
Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f
2018-10-16 07:11:57 +02:00
Alexandru Croitor
f612833d83 Debugger: Pretty print the name of a function when using lldb
This is achieved by calling "po" on an address value casted to a
simple function pointer type, regardless of the actual type of
the function pointer. lldb does not complain, and reports the
library where the function is defined, its name, and location
in the source code if available.

Change-Id: I23ccce62e33bcf213ccdcb55c9836d54333f3c86
Reviewed-by: hjk <hjk@qt.io>
2018-10-15 15:39:16 +00:00
Christian Kandeler
c920c8aafa Botan: Fix MSVC build
Was broken by a patch rebase.

Change-Id: Ifce3a4c799895bac30b5b3e07a18e3fe6a1da070
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-15 12:39:03 +00:00
hjk
683e7aa6cf ProjectExplorer: Make BuildStepConfigWidget::displayName a value
Use BuildStep::displayName() as default.

This probably could be the only possibility, but currently there
are some discrepancies that are kept in this patch to make
the patch mechanical.

Change-Id: I2a1e5c2ff37ad95e25309eb16e07099e42191f60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-15 12:08:22 +00:00
David Schulz
c37bedfb02 LSP: split out settings specific for std io clients
Change-Id: I25eebfc15a9d0d5665e57137f016e54a069ca849
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-15 11:51:10 +00:00
hjk
5fc1b5d8e7 Make IDeviceFactory use data members
... for display name, icon, and "can create".

Also add a convenience function for the special icon setup that's
used in all re-implementations.

Change-Id: I8332adb38fb4a77b6992007ffe62f861339ba188
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-15 11:32:30 +00:00
hjk
0ebe8402c7 Debugger: Fix breakpoint disabling using context menu
Change-Id: I3fa5ef2dc123f5f7f8292147626453284c1afd76
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-10-15 10:56:02 +00:00
Christian Kandeler
922a363fb4 Botan: Enable optimizations in release mode
Because we override the cxx flags manually to silence some warnings, we
have to pass the -O flag too.
On my machine, this results in a speed-up of factor four when uplading
via SFTP.

Change-Id: I3279f0cc95624530fdb5b7ea868a8a51962fb4f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-15 09:17:04 +00:00
Christian Stenger
fdde4529e8 LanguageClient: Fix condition
Change-Id: I4978fb7d28789c3888aa521b5b400e1d79f31a91
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:17 +00:00
Christian Stenger
c67b2e84cc LanguageClient: Perform safe shutdown of clients
This avoids running into a soft assert and is basically the
common pattern used when shutting down the client.

Change-Id: I9a2eea8d2ffe51f81d6bb78353606ef492628897
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:10 +00:00
Christian Stenger
b30f82d3fb LanguageClient: Sync settings on plugin initialization
Otherwise we might end up starting a second language server
when opening options page of Language Client plugin and
closing again with 'Ok' without modifying any setting.

Change-Id: I2b16436b92a0d622dc7df1b5fbdaf9f9f8e717a2
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:01 +00:00
Nikolai Kosjar
bd6f30da70 Clang: Improve debug log message
Change-Id: I82b8f4fc72614f6671815e3b1dbfad87a062ae98
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-15 07:28:22 +00:00
Andre Hartmann
892db36c26 Git: Update documentation for the branches side panel
Change-Id: Iff10716debd4e24382ed52e288d04c2dbdd86b1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-15 07:17:42 +00:00
Orgad Shaneh
bdc2b4b59f Remove hard-coded disabling of debug logs
Instead, set the default level of all logs to QtWarningMsg.

The call to setFilterRules overrides the user preferences in qtlogging.ini.

Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:36:58 +00:00
Orgad Shaneh
a27d4e9455 VCS: Re-add state logging
Recovers logs that were removed in
05312bfeec.

Change-Id: I4f433795917ee331623ead8f465ef26f53bed229
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-10-13 16:36:50 +00:00
Orgad Shaneh
0138b73469 VCS: Use category logging
+ clean the logs a bit.

Change-Id: I5a196f7007eb2b76bcdce4b2ac152da84698b860
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-10-13 16:36:41 +00:00
Andre Hartmann
299c777c01 Git: Fix context menu actions in BranchViews second column
m_branchView->indexAt(point) returned another model index
[column 1] than m_model->currentBranch() [column 0], if the
context menu was requested in thesecond (date/time) column.

The failed comparison then gave a lot of invalid actions
(like merge) for the current branch.

Change-Id: Icefc084c81f9b573cd151460db793d3c5a01eb2b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-13 16:36:14 +00:00
Andre Hartmann
81a4c1d934 Git: Simplify conditions in BranchView
index.isValid() is already checked in line 165,
so it does not need to be checked afterwards
because it is always true there.

isLeaf is only used once, so join the assignment.

Change-Id: I5f21486fd440b82d8e99be1248adf023da664c1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-13 16:34:22 +00:00
Orgad Shaneh
17fa69eb42 Debugger: Translate user-visible strings
Change-Id: I8cd2c93bf6713cb1b5379228c700d36c3b71c261
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:33:02 +00:00
Orgad Shaneh
147a3c27c4 Debugger: Strip QLatin1* where possible
Change-Id: Idcab23875b5dc2ecf55e3303f417b995e2252720
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:32:31 +00:00
Orgad Shaneh
d0d6f99491 Merge "Merge remote-tracking branch 'origin/4.8' into master" 2018-10-13 16:32:20 +00:00
Christian Kandeler
d2dbe84519 QbsBuildStepConfigWidget: Remove redundant BuildStep member
Change-Id: I7b4eb97dbf4a9450561628f88f4893d45b2e54e8
Reviewed-by: hjk <hjk@qt.io>
2018-10-12 16:46:20 +00:00
hjk
cbb98bedcf ProjectExplorer: Merge SimpleBuildStepWidget into BuildStepWidget
The extra m_step member is not worth the abstraction, especially
since almost all non-SimpleBuildStepWidget have something similar,
too. Also, as several derived classes needed to correct
SimpleBuildStepWidget's setShowWidget(false).

Change-Id: I6e80d8c84c363b90dc27c70abd7fa6cefa1ed91e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-12 16:01:46 +00:00
Orgad Shaneh
1934d584c8 Merge remote-tracking branch 'origin/4.8' into master
Change-Id: I6ecd3732a147960681c6135e8752cbd046bad65b
2018-10-12 17:21:14 +03:00
hjk
03d525a3bc Debugger: Simplify 'short int' to 'short' in type displays
Change-Id: I63946a983c4dd47e31f26e5f70a4c3c9e31c92ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 14:07:56 +00:00
hjk
53228b8b0d Debugger: Add a note on LLDB 6.0/Linux type mis-reading
Code "QStaticStringData<1> sd;" ends up as "QStaticStringData<4>"
when read by LLDB. GDB is fine.

Change-Id: Ieef8d4a4c267d6e0bb45c96f8dc9c05a79b66381
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:34:53 +00:00
hjk
cd3011520f Debugger: Fix qfloat16 dumper for LLDB 6.0 on Linux
Needs some hint that floats are involved.

Change-Id: Ie6871ce3b6bb7aaff27e6c763a6002a6d0a90d70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:24:46 +00:00
Christian Kandeler
a71bb65312 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: Iab0a0382235c4ac2bb93782b6d4a88458b231b7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-10-12 11:19:14 +00:00
Christian Kandeler
d3cc47f757 Update bundled Botan library to version 2.8
Change-Id: Ie8fb13f096a3a8658f6bde3d21f46ea453dc627f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:10:46 +00:00
Leena Miettinen
8f29b0bcde Doc: Update info about supported Android, JDK, and SDK versions
Remove limitations for debugging on Android versions that are no longer
supported.

Task-number: QTCREATORBUG-21255
Change-Id: I9d36638b9b2c47485b4aa47d0c563e6c153271e5
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-10-12 10:51:48 +00:00
Leena Miettinen
a48f20d0dc Doc: Fix section levels in "Completing Code"
The section levels should have been elevated, when the info was
moved into a separate topic.

Change-Id: I1b1592773356320f32758cac331611d73aed6106
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-12 08:48:47 +00:00
Ulf Hermann
51562b55e4 Ssh: Add mtime to QSshFileInfo
We will need it for checking if a file needs to be deployed.

Change-Id: I4dc4e3a43ea161b27319ee2771806c1d52679856
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-12 08:36:33 +00:00
Eike Ziller
e5d1bc9cce ActionContainer: Fix inconsistency in book keeping
It doesn't make sense to specify both a group ID and a menu to add
another menu before. This most certainly leads to inconsistency in the
internal book keeping in m_groups vs the actual menu insertion point.

Change-Id: Ic30508f390885ddeb72eb94f26efb75456b469ec
Reviewed-by: hjk <hjk@qt.io>
2018-10-12 08:24:51 +00:00
Eike Ziller
50d9e58ede Bump version to 4.8 beta2
Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-12 08:19:23 +00:00
Marco Bubke
28007d9a1c ClangPchManager: Introduce UsedMacroAndSourcesCollector
It's a subset to thesymbols collecter so we try to share some code.

Change-Id: I058eee39289453e205f039b3850c1816f1d8ec1a
Task-number: QTCREATORBUG-21257
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-12 07:51:49 +00:00
Eike Ziller
cec48ea156 Merge remote-tracking branch 'origin/4.7' into 4.8
Change-Id: Ic90a78fb7be7b8eb23f250f04eb074813f2a004a
2018-10-12 09:39:54 +02:00
Jarek Kobus
c77cb96d99 Fix the unguarded-availability-new error
This fixes the following error, when using LLVM 6.0.0:
cc1plus: error: -Werror=unguarded-availability-new: no option -Wunguarded-availability-new

Task-number: QTCREATORBUG-18398
Change-Id: I243e6165cd624440eb0f376594b2f802c5c909bb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-12 07:32:21 +00:00
Christian Stenger
31ed8137d6 ExtensionSystem: Remove icon from categories
It provides no real additional value and seems to
be more confusing when Qt Creator gets started with
command line options that load disabled or disable
enabled plugins.

Change-Id: I979f9ee95154af11aedd6100717043adc5e1e7a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-12 05:34:05 +00:00
Christian Stenger
c8f4ee66f6 ProjectExplorer: Fix compile for gcc5.3
Change-Id: I25b77b50b68c48cc23481ebf9af1bdea7ffef366
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-12 05:23:26 +00:00
Ulf Hermann
6a19eebfc2 QML Debugger: Make sure to claim break points before CONNECT
Otherwise we have a race condition. The breakpoints may be hit before
they are set.

Change-Id: Iccdd64758b150acdfadc18cba88abdf841feb6c7
Fixes: QTCREATORBUG-21253
Reviewed-by: hjk <hjk@qt.io>
2018-10-11 14:42:34 +00:00
David Schulz
df08e1ee3d LSP: Store settings in the settingspage
... and keep just a copy of it in the model. This way we
can easily reset the setting model content to a preedit state
without rereading it from the user settings file.

Change-Id: Id2f094caade7c56eff48fd9abce00d687e607a39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-11 13:15:04 +00:00
Marco Bubke
414c7f9f1e TextEditor: Add Overloaded Operator and Punctation to text styles
Task-number: QTCREATORBUG-21285
Change-Id: Ib5d8aac74ff94c506f0888dff3ada802ac605af0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-10-11 12:48:38 +00:00
Marco Bubke
f2bd50c466 TextEditor: Remove defaults from Format
The default caused strange bugs because it was expected that no color was
set.

Task-number: QTCREATORBUG-21282
Change-Id: I3b520b944ffcb87838ba3e7b02e1d28b0f757679
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-10-11 12:48:26 +00:00
Ivan Donchevskii
352ac2ccf4 Utils: Fix column returned from helper function
The second function overload must also return 1-based column.

Change-Id: I1d3a58c9267e4a8c8a031c72230f963596a7bb2b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-11 12:13:03 +00:00
David Schulz
253f71bfab Cdb: fix std vector dumper in non python dumper
Task-number: QTCREATORBUG-21074
Change-Id: Iae78195b5bed1a6baa4515bf578d4f0b004eddae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-11 11:38:50 +00:00
Ulf Hermann
341f978969 RemoteLinux: Drop stopRequested from GenericDirectUploadService
It can never be true. And there is another stopRequested in
AbstractRemotelinuxDeployService.

Change-Id: If30b0732f87ddbe573112334a1e4ce719614edfc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-11 11:12:31 +00:00