Commit Graph

54723 Commits

Author SHA1 Message Date
Marco Bubke
422f4cdbb8 Clang: Fix warning
Change-Id: Ic1556b4e7aafeae74ebe8c194e9a45fdfebcb9db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-20 12:50:08 +00:00
Tobias Hunger
7e81d330d9 CMake: Hide INTERNAL and STATIC configuration entries in Project UI
Task-number: QTCREATORBUG-18403
Change-Id: I6b69305ff0dc337da1d8b20e0321be5ce1b1f595
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-20 12:03:15 +00:00
Christian Kandeler
d5066ac06e QbsProjectManager: Introduce QbsKitInformation
... and use it to allow users to set custom properties in the
corresponding profile. This replaces the idiosyncratic and more
complicated approach we had before, when that was done in the qbs
profiles settings page. The profiles view is now read-only.

Change-Id: I0c29c1ac0c510e17d685e7bbaa38b54c8100ddb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-20 12:00:11 +00:00
Orgad Shaneh
06ef0ed153 Merge "Merge remote-tracking branch 'origin/4.3'" 2017-06-20 10:04:38 +00:00
Tobias Hunger
4dc3ef8034 Qmake: Only offer Add Library wizard for qmake projects
Task-number: QTCREATORBUG-18415
Change-Id: Icd8535a6d7d599457c23f92958fa969661076ade
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-20 09:20:50 +00:00
Marco Bubke
e4d780c6c3 Clang: Remove unwanted warning
Task-number: QTCREATORBUG-18398
Change-Id: I01aa72d6f2fd49d082231699e0f565215d2a00ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2017-06-20 09:00:45 +00:00
Orgad Shaneh
687466ac47 Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
2017-06-20 11:32:02 +03:00
hjk
f047e1a2a2 ProjectExplorer: Simplify standard run control construction
A lot of the target-and-tool specific run controls nowadays
have something like a single main RunWorker. This patch
removes the need to have user-implemented RunControlFactories
in those cases and adjusts local run, remote linux,
python and nim to take advantage.

There's more potential use downstream.

Change-Id: Ie2d2f839b8be1fad2be3b79e21de3c0e475d88cf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-20 08:04:33 +00:00
Orgad Shaneh
1cb8e1d291 GenericHighlighter: Update from KSyntaxHighlighting
Change-Id: Id2a6daabef6dae29e83df99ed195f7356f26866c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-20 07:56:12 +00:00
hjk
56028d2e3e QmlProfiler: Cosmetics
Avoid using remote/local as (not user visible) names. 'internal'
means 'whatever the current target does', i.e. could be a remote setup,
'external' means 'attach to something running or waiting.

Also user setServerUrl() directly on the worker, no need go through
the 'opaque connection' mechanism here.

Change-Id: Id0e694562ce7d3129c7d0b790c91d465de24b4e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-20 07:51:22 +00:00
Nikolai Kosjar
e50ad1e09c CppTools: Avoid concurrent access to QTextDocument
Do not pass QTextCursor to another thread, but determine what we need
from it in the main thread.

Change-Id: I86900cfc5a28849efc1bd1dacb9b1452a5db252e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-06-20 07:42:06 +00:00
Orgad Shaneh
b89888ca9d Clang: substitute __float128 with short instead of void
There is an argument of this type in std_abs.h. void argument is invalid.

Replacing with float, double or long double causes an error in type_traits,
which has template specializations for __is_floating_point_helper for all
these types.

Change-Id: Ife95fa992cbf9684bc67a2098d6609a9a925d015
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-20 07:02:19 +00:00
Jake Petroules
1df1745c63 Properly mark "Check for Updates" menu item as an app-specific item
Check for Updates menu items are supposed to be displayed in the
application menu on macOS, not the Help menu as for other platforms.

Change-Id: I8d13f2658b3b0e0b9b01ef5b64bd7804d6b7e424
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-19 17:39:40 +00:00
Marco Bubke
17b197f303 Use declaration and output argument in dark style
Change-Id: Icca770dfbeedd6207960202ea4b42c2045f320ef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-06-19 15:43:42 +00:00
Marco Bubke
7cebfd0a0f Extend default text style
We introduced some new text styles but never used them in the default
style so far. To make them more user visible we have done following changes

Output Argument to italic
Declaration to bold
Local variable to dark blue which is different to Macros
Global variable to orange
Functions to water blue

Task-number: QTCREATORBUG-18151
Change-Id: If3f62f74795b5ae35a92db2ef6d5c48219c8ad18
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-06-19 15:43:36 +00:00
Jake Petroules
a251c2c966 Adapt to new architectures handling in qbs
This lets qbs handle architectures entirely for GCC/MinGW, ICC, and MSVC
toolchains, as well as projects targeting Android or any Apple platform
with any toolchain. Now Qt Creator only passes down architecture
information to qbs for QNX/QCC and Clang on Windows, Linux, BSD, etc.

Change-Id: I44925671d7f280890f9e25a5726d019d3f98dea9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-19 14:26:55 +00:00
Nikolai Kosjar
4a6057357b Clang: Do not gray out e.g. #endif
Task-number: QTCREATORBUG-18389
Change-Id: I8b0067f3860a0e0e09360da5989011e69adddce0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-19 13:27:00 +00:00
Eike Ziller
faae35d2af Optional: add reset()
It is part of C++17

Change-Id: I2aa4a11133a3d77644f4819492623c8e424ccd59
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 12:21:04 +00:00
Eike Ziller
59f1f6dc79 Locator: Remove explicit internal bool from locator filter entries
Use optional to get rid of an explicit bool to keep track of whether
file icons have been resolved or not.
Relying on QIcon::isNull() would not be good, because the result from
QFileIconProvider can be a null icon.

Change-Id: I56720d56687f5e35d0c50b485d50e324d9940f30
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 12:20:37 +00:00
Nikolai Kosjar
6bacfdac7c Clang: Set help id for tooltip
...so it can be cached. The base implementation does this, too. For
certain uses cases, it will avoid a call to context->contextHelpId() in
HelpPlugin::showContextHelp.

Change-Id: Ia575595c6f723e3681d4685e2e1ce65b2e435ad1
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-19 11:08:45 +00:00
Nikolai Kosjar
b869f02f72 Clang: Introduce headers for client/server messages
This reduces the overhead when a new message needs to be added.

Change-Id: I5bb2833af2f06f2a8e101cfb03f75ffc2927bf68
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-19 11:08:39 +00:00
Nikolai Kosjar
1e76485402 Clang: Remove left-over debug statement
Change-Id: I5c256221cd4afa950a98b48fb7c44680d36a3b3c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-19 10:43:44 +00:00
hjk
c060571fcd BareMetal: Avoid use of otherwise unneeded requestRemoteSetup() signal
Note that this changes the startup timing in the StartupOnNetwork
case slightly, as the application launch is now triggered in
parallel with the gdb launch.

Change-Id: Iaa0b60b8c478eb47abb6e93fbd3b326e0acdd13b
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-19 10:43:19 +00:00
hjk
d1247d6796 BareMetal: Move closer to a RunWorker based setup
Change-Id: I4160f2e14cdfca7183214a02f1406317291da6be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-19 10:43:02 +00:00
hjk
a55a376b1d Debugger: Fix crash on ramp down
Change-Id: I76aab19d92eae10823196a4c6dc9a2c400d47e80
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-19 09:24:49 +00:00
hjk
b129cebccc Debugger: Fix manual splitting of complex template parameter types
Parsing has to stop at the first < (coming from the end).
foo::span<int>::bar<double> has a parameter 'double', not 'intdouble'.

Change-Id: Ied142d5e75a7587d6c0efd3b51608b199b999e93
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 09:24:38 +00:00
Eike Ziller
2897414d3b Add std::hash for FileName
Change-Id: Iaef49c826c0febf3a9cb1fdc97de9f92c261cf40
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:37:11 +00:00
Christian Stenger
cce1e130d7 AutoTest: Fix handling of multiple build targets
If project files are not mapped 1:1 to targets the result
of the chosen executable was more or less random.
Try to handle multiple targets as correct as possible by
checking for build targets already where we still know
which files are part of the respective test cases.

Task-number: QTCREATORBUG-17783
Task-number: QTCREATORBUG-18357
Change-Id: I82dcc26bf52c9918e2727b439a719af08879ef49
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:14:55 +00:00
Christian Stenger
bde8ebc56c QbsPM: Re-introduce uniqueProductName()
This patch prepares for enhancing information stored inside
buildSystemTarget.

Change-Id: I5d81fd01ab6b06c162f47fd9536de697ddfd24a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:14:39 +00:00
Orgad Shaneh
a36536813f VCS: Set user choices on editor reload
Broke by 2c6adc1e74.

Change-Id: Iba435899c7b0da4b270f4ef8ece84c1839bf6b72
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:08:02 +00:00
Orgad Shaneh
b57553b7a2 QmakePM: Fix redundant execution of qmake on build file
... when Makefile is customized.

The resolved makefile was <directory>Makefile.custom instead of
<directory>/Makefile.custom.

Change-Id: I01c4ef8b6d4ba64fc6663219c2eab7a39e03888b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:07:08 +00:00
hjk
771d9f222c Debugger: Make 'Debug all children' label a bit clearer
Change-Id: I02f0ca307bff01745f75fa1cf9c149b867577f7f
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-19 07:53:09 +00:00
hjk
bfb0e025d9 Android: Make selector() arguments to runAdb implicit
Less code on the user side.

Change-Id: Ibf19ca725557c2de67743bd3b4b621f04bb896c7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-19 07:52:37 +00:00
Christian Stenger
ea86ff5eb0 AutoTest: Avoid triggering run tests while building
Disable respective actions while a build is running to avoid strange
side-effects or race conditions.

Change-Id: Ifc8d1c9fc9fd4d705cabd148b145708e23029dba
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-19 06:59:08 +00:00
Christian Kandeler
70e6bb2827 QbsProjectManager: Allow to import builds
Task-number: QBS-1059
Change-Id: Ibf45fbd870eb22f79883331f6559e1487df25ad0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-16 16:02:01 +00:00
hjk
a25f394f68 Debugger: Add dumper for std::{optional,byte} and gsl::{span,byte}
Change-Id: I7e06214bfd2ace91f480b73bb370e5dc6297c502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-06-16 15:31:31 +00:00
Eike Ziller
76a07a453e Locator: Rename show -> showText since it collides with QWidget::show
Change-Id: I9f99ef14c318e54ddb84a462e767d2f1c1e2f3ec
Reviewed-by: hjk <hjk@qt.io>
2017-06-16 15:01:26 +00:00
Christian Kandeler
43a7fa28b1 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: I4bb157ec17aa25a3df6c4fedd89e332f167935ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-16 13:54:01 +00:00
Tobias Hunger
abdc6790ee VcsManager: Use nullptr and member initialization
Change-Id: I7a04d609f62d1a221eb2b814a67b2dd816d90e6c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-16 13:39:28 +00:00
hjk
232fb7a425 QmlProfiler: Split server url passing from custom startup request
Orthogonal concepts, that only happen to coincide.

Also, make the server directly settable instead of relying
on the runControl's connection().

Change-Id: I2472acafcc50aede2cb6f99421901f0e67531b91
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-16 12:55:21 +00:00
Eike Ziller
923c20bd9c Locator: Move filter action creation out of input field widget
Change-Id: I380e28444b33caa2c3c2724ad2933a13fdcb312a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 12:20:50 +00:00
Eike Ziller
93f4fb771f Add std::experimental::optional as Utils::optional
Uses the reference implementation of the proposal, which later
can be replaced by the std lib implementation depending on compiler
and used C++ version.

Change-Id: I23f2f8077f4cb26c3d9a403b1ce438b6cdb163f2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 12:19:27 +00:00
hjk
42580c7d0c ProjectExplorer: Expand %{Device:Name} to device()->displayName()
Change-Id: I9ae7bc0f55933c83aaefb0d1df8e9873386f36a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 12:19:26 +00:00
hjk
25a75d3fa3 Debugger, QmlProfiler et al: Replace AnalyzerStartParameter
... and QmlProfilerRunner::Configuaration by PE::UrlConnection,
and call it 'serverUrl' on the user side.

That's the only variant we ever had and avoids "translations"
between three structures that are essential the same.

Change-Id: I33386b2b8d2a7985ff934f6f8f840de0831bf9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-16 12:19:16 +00:00
Christian Kandeler
bb4edc33fd Toolchain support: Better detection of cross-compilers
For instance, executables like arm-linux-gnueabihf-g++ or x86_64-w64-
mingw32-g++ are now detected as gcc and mingw toolchains, respectively.

Change-Id: Ia0884215969ae66613cc709bf02fcf32a67da207
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 10:39:46 +00:00
Robert Loehning
b5c482a906 QmlDesigner: Remove double negations
Change-Id: Ifd5900ebf1e42c6fd8a762e24763c986228ef39d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-06-16 09:16:16 +00:00
Nikolai Kosjar
0bc782c468 Clang: Add CLANG-UPGRADE-CHECK marker
...for things to watch out on an upgrade.

Change-Id: I75b77a3c8fa238939b625d084c7db220ab429319
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 07:11:43 +00:00
Nikolai Kosjar
1623af0da5 Clang: Add a disabled test for highlighting
In the example below, "var" is highlighted as a function, but it should
be highlighted as a local variable.

  struct OtherOperator { void operator()(int); };
  void g(OtherOperator o, int var)
  {
      o(var);
  }

This is due to a libclang bug.

Change-Id: I7c9fcad6f16c25191d31fc330e969ebd282d4869
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:09:19 +00:00
Nikolai Kosjar
cde8738269 Clang: Remove pointless call in tests
It was added only for debugging.

Change-Id: I7ea80d8d472f319cdcac548d3abf602e0f304fc9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:08:58 +00:00
Nikolai Kosjar
d573aebf12 Clang: Remove pointless code
This was some intermediate state.

Change-Id: I1390d9b4721a53a08ecc6b6d346dd1e2d9468989
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:08:49 +00:00