Commit Graph

57165 Commits

Author SHA1 Message Date
Alessandro Portale
436967ebf0 Core: Options: Fix category list width
If the vertical scrollbar is invisible, it reports a width of 100
pixels. Use the width of the size hint, instead.

Task-number: QTCREATORBUG-20353
Change-Id: I3d50041788f12360a98a8f41923c6a38e23a63e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-02 15:59:54 +00:00
Orgad Shaneh
366b813c5c Gerrit: Warn when probably pushing to wrong branch
For rebase/merge strategies, this can cause real problems (when the target
branch is forwarded to a more recent branch...)

Task-number: QTCREATORBUG-20062
Change-Id: Ic7c282a1e0571b31d9333290141817c59daa0e7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-02 15:45:53 +00:00
Ulf Hermann
9b4fabd29e Debugger: Export the TRACEPOINT icon and add a TOOLBAR variant
Change-Id: I8cb5fab06b145c7eb68c370d3ad864fde75af3bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-05-02 15:06:40 +00:00
Tobias Hunger
6fbf0255eb ProjectExplorer: Remove FolderNode::addNode taking a raw pointer
Change-Id: I53b765d2c3e71889386c76425662bfcc47bdf582
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 14:55:29 +00:00
Tobias Hunger
8bbe795c39 ProjectExplorer: Make FolderNode::replaceSubtree take a unique_ptr
Change-Id: I8e853c00ec24838bdca342e3f1a1b1213f32ef93
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 14:55:21 +00:00
Tobias Hunger
d332954567 ProjectExplorer: Add and use addNestedNode(...) that takes unique_ptr
Change-Id: Ieb26721d053111fb350494e31d1f6da3fe642420
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 14:55:15 +00:00
Alessandro Portale
f9585d939f ProjectExplorer: Fix build for MSVC
(Done by Tobias)

Change-Id: If85f64681986cf56f493fa448977a2da248e167d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-02 14:54:24 +00:00
Robert Loehning
164f96e9b6 DocumentModel: Replace optional::value by non-throwing alternative
...to calm down static checker which
fears throwing exceptions into dtors

Change-Id: I595c79ca6d19c7592e98437585fc33c4071d09c6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-02 14:28:44 +00:00
Thomas Hartmann
0087a74ecc QmlDesigner: Only the rewriter for the document should block UI
We use different rewriter for different purposes. Only
the rewriter that manages the current document should disable the UI.

Change-Id: Ic410f7ee62ce13bb0eef133619f93c05b5632a56
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-05-02 14:01:28 +00:00
hjk
cf43803032 Make DeployConfigurationFactory more similar to RunConfigFactories
This follows some of the recent changes to RunConfigurations:
- pass Id from factory to DeployConfiguration constructors
- de-object-ify DeployConfigurationFactory
- use addSupportedTargetDeviceType(Id) instead of
  addSupportedTargetDeviceType(List<Id>)

Also, use stepList()->appendStep() instead of stepList()->insertStep(pos...)
with manual pos tracking in some cases.

Change-Id: I09c6a9d0f66f9f85b1c13361104f7878028e1ea8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-02 13:55:43 +00:00
Christian Stenger
8f6a560ed7 CmakePM: Fix compile for gcc4.9
Change-Id: Iecd2dc6df45199de049b02f24b1d1961b296ee2d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-02 13:28:51 +00:00
Eike Ziller
4749a919a6 Merge remote-tracking branch 'origin/4.6'
Change-Id: I9927fdff4c7e73c703757852a3f3cf79444e3cb6
2018-05-02 15:22:16 +02:00
Eike Ziller
e8b13fe3c9 Fix wayland plugin deployment
The functionality is spread over several plugins, not just the platform
plugin.

Task-number: QTCREATORBUG-20354
Change-Id: I3b120d1792be31c98707e2e60124911f3d138188
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
2018-05-02 13:18:55 +00:00
Christian Stenger
c46b6dbb56 Utils: Fix treemodel's hasChildren
Basically this reverts 08e73d1a93, but adds an
additional check for the column as the BaseTreeModel
implementation just allows children at the first column.

Main reason for this revert is that the variable choosers
used across Qt Creator did no more populate their
respective macro lists automatically.

Change-Id: I172506a9dbe18f20b152ec797f35feff717dc3cf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-05-02 12:58:28 +00:00
Tobias Hunger
147e6078ad ProjectExplorer: Make FolderNodeFactory return an unique_ptr
Change-Id: I9b611c4a3ff0928b2078dc30a44eb39df67c8d89
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 11:34:47 +00:00
Tobias Hunger
04057106ba ProjectExplorer: Remove FolderNode::removeNode
Use takeNode instead.

Change-Id: I7e05c4ba7c18aaabcdad5160f91a2c2ad754b758
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 11:34:40 +00:00
Tobias Hunger
5754d5accf ProjectExplorer: Use unique_ptr for Project::setRootProjectNode
Change-Id: If63a49d0eecfb93adcc6076fcb3208c87603af10
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 11:34:35 +00:00
Tobias Hunger
1f55ba9012 ProjectExplorer: Use unique_ptr to hold ProjectNodes
Change-Id: Iaa5bea221686564de24138a99b5fe0d09521c118
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-02 11:34:29 +00:00
Orgad Shaneh
dc982a1326 QmakeAndroid: Remove redundant function overrides
Change-Id: Ib019d1dc484e153f17c5ca0c03be08b1ed491e4e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-05-02 11:19:28 +00:00
Nikolai Kosjar
d7bd9c47e2 Clang: Fix typo in QSKIP()
Change-Id: Ib672dc89d33f6da2625b8c12c390e8b677189561
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-05-02 10:41:44 +00:00
Robert Loehning
c5511de338 Squish: Remove hooking into subprocesses
It worked well but the maintenance burden turned out to be too much.

Task-number: QTCREATORBUG-20055
Change-Id: Ic8663f808c50ca9fb17d52b6bc6c72baf7503358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-05-02 09:51:05 +00:00
Eike Ziller
70e27bb8ea Insert new bookmarks after the "current" bookmark
Makes it more useful as a navigation instrument. If new bookmarks are
always added to the end of the list, the "previous" bookmark will have
nothing to do with the context of the bookmark that was previously the
"current" one.

Task-number: QTCREATORBUG-20061
Change-Id: I0ea38391750371dec80872206d97f4934a37f7b4
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-05-02 07:11:11 +00:00
Eike Ziller
658d5b5d2c Bookmarks: Improve behavior of "Previous Bookmark"
If the text cursor is currently not at the "current bookmark", it is
more intuitive and useful if "Previous Bookmark" first moves to the
current bookmark, instead of jumping to the one before that.
That solves two issues:
- creating a bookmark, jumping somewhere else, and then going back to
  that bookmark
- deleting a bookmark, and then going to the previous one

Task-number: QTCREATORBUG-20061
Change-Id: I6dbb8c94f4d50ae4cc36e52808029e685be11069
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-05-02 07:10:43 +00:00
Eike Ziller
80b9f047f6 Add previous and next buttons to bookmarks pane tool bar
Task-number: QTCREATORBUG-9859
Change-Id: I2555fc89cd893681ee17b272def053f1e42e9368
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-05-02 07:10:13 +00:00
Przemyslaw Gorszkowski
c1097cbe7f SilverSearcherPlugin: fix searching if PATTERN starts with dash/hyphen
Change-Id: I48a6d8a9748b5a8334b7972cae4294d4e8c1c740
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-05-01 08:09:01 +00:00
Hugo Holgersson
142ae0cdf9 Clang: Add semantic C++ operator-token styling
We used to style overloaded operators in the same way
as C++'s built-in operators. There was no way to tell
if a + token would call a operator+() function or not.

Now, if an operator is overloaded (redefined),
we give it the "Overloaded Operator"-mixin so users
can style it differently.

Note: Calls to overloaded 'new' and 'delete' are not
highlighted by "Overloaded Operator". This is because
clang today always maps these to CXCursor_CXXNewExpr
and CXCursor_CXXDeleteExpr with cursor.spelling == ""
(empty string). So there is no (?) quick way for us
to tell if a new/delete-token was overloaded or not.

After follow-ups, follow symbol will work for operator
overload usages in current translation unit.
Commit is appended by Ivan Donchevskii.

Task-number: QTCREATORBUG-19659
Change-Id: I157855d482a61ad2059642a1ee982089fcb7d312
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-30 15:10:12 +00:00
Christian Stenger
bb6eae5c3b Heob: Fix compiler warnings
Fix warnings regarding initializing order.

Change-Id: Iea220be1fcca47262ebf43d0cfe069ca0bfc1df5
Reviewed-by: hjk <hjk@qt.io>
2018-04-30 12:55:39 +00:00
hjk
065e644d92 Heob: Compile fix for MinGW
Task-number: QTCREATORBUG-20347
Change-Id: I13d0e4cae19a1623113f113dc6fe7e245d54be8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.6.1
2018-04-30 12:10:55 +00:00
Eike Ziller
222f6fcc24 Update 4.6.1 change log
Change-Id: I368f945f56588d3219ea11b3269c3e4e62e7029a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-04-30 11:59:43 +00:00
Ivan Donchevskii
b4417527ca Clang: Move 'disable_external_rpath' to clang_installation.pri
It should be required for every project part which
depends on LLVM.

Change-Id: I8d645661dfa4fc4858bb40e156671a0ecf0bdbe3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-30 11:51:51 +00:00
hjk
67c775afd6 Python: Code cosmetics
Remove some unnecessary #include and use a recently introduced
RunConfiguration::builtTargetInfo() convenience function.

Change-Id: I76750fd66ae2c268b68d225c62aad7d880256d07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-30 08:48:48 +00:00
hjk
c6cc997be4 Python: More RunConfiguration aspect use
Include interpreter and main script settings.

Change-Id: I91c19ef124ff8b7da34bc67fb1a5ef054c3499b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-30 07:36:42 +00:00
hjk
e8d1adc57f Remove no more used BuildTargetInfoList::targetFilePath convenience
Change-Id: Ia5c446a82c2309774cafff7e8aaa04b287d8ee86
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-30 07:27:26 +00:00
Christian Stenger
e2fecc6130 BareMetal: Translate untranslated string
Change-Id: Ieba95362cb3468aeb49ed76fe7213b19fdbf6e4f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-04-30 07:24:47 +00:00
hjk
b6eae5887e BareMetal: Split runconfigs into independent classes
Since the need for code reuse is gone due to the recent changes
in the RunConfiguration base infrastructure, it's easier and less
code to completely separate the cases.

Change-Id: I3fc558ea60e02f34b50869d4b55a43a6360e9208
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-30 07:22:27 +00:00
Alessandro Portale
d3851d64ba Projectexplorer: Tweak cancel_build icon a bit
Push the stop icon towards (but not completely) the hammer center,
so that there is a visual balance. Also, it is now approximately
aligned with the beetle from the debug button.

Change-Id: Ia277b1ead3ea2357171d386d41e413b38175a691
Reviewed-by: hjk <hjk@qt.io>
2018-04-27 14:16:18 +00:00
Alessandro Portale
729fc96c48 dark theme: Define splitterColor
Color "SplitterColor" is neither a named color nor a valid color

Fix-up for: 98e26dc6fb

Change-Id: I2d3749a06850e4c630d6a0392e6a1c6e2a75258f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-27 13:52:35 +00:00
hjk
9ed3a05c59 ProjectExplorer: Introduce a RunConfiguration::buildTargetInfo() function
As convenience function, and use it in some places.

Change-Id: I02e49f2cdc301bbf1261836032d3fa3a5b188446
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-27 13:46:54 +00:00
hjk
50f2bcd9ae Python: Plugin code cosmetics
Use the common pattern for PythonEditorPluginPrivate.

Change-Id: Icec8d975e0ab921be7121d123af4dddecd7d0384
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-27 12:12:37 +00:00
Christian Kandeler
a657ff4a2a Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: Ib88fb706ef762ac389621132c8fcfb3f7a9c24ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-04-27 11:02:54 +00:00
Ulf Hermann
f0baf01a2e ProjectExplorer: Keep RunConfiguration in ISettingsAspect
Any SettingsAspect that doesn't refer to the global settings has a
specific RunConfiguration it is about. This can be very handy to know
when constructing the actual settings. Right now there is no way to find
out about it.

Drop the clone() and create() methods. They weren't used anywhere and a
proper implementation should take care of the runConfiguration member.

Change-Id: Ie505a9b19707f8a1b6bf9cae73513cd3c30d0bca
Reviewed-by: hjk <hjk@qt.io>
2018-04-27 08:55:24 +00:00
Marco Benelli
9678ea5755 QmlJs: add test for code model
Change-Id: I3e60274dcce578a170e12d44533e6f83e77d448a
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2018-04-27 08:27:03 +00:00
Alessandro Portale
1dbdd259be Remove some obsolete code inside QT_VERSION_CHECK sections
With Qt 5.9 as minimal build version, we don't need to handle 5.7 or 5.8

Change-Id: Ie1eed95ab46364452b0633f78bebc565a4a63f4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-27 07:43:49 +00:00
Christian Stenger
4533015c66 Tests: Fix include path
Change-Id: I4e05a306aa5947ef12854186b9d700de31fda170
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-04-27 06:22:34 +00:00
Ivan Donchevskii
acc69f67c8 Clang: Do not try to build ClangTools without LLVM
Change-Id: Iecec62047b5f2327be6843ac9d3ccd87be4bf8f6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-26 14:00:22 +00:00
hjk
98b026f9a9 ProjectExplorer: Rework CustomExecutableRunConfiguration
Split the run config widget according to the two use cases
(direct apply, delayed apply). As basically most data members
and important logic was not shared, the double-use made
the CustomExecutableRunConfiguration implementation needlessly
complicated.

Change-Id: If92ba22bae31378bae29049e0d27095b2bbd6090
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-26 13:58:00 +00:00
Ivan Donchevskii
219e23332e ClangTools: Add tool that runs clang-tidy and clazy
... over the whole project.
Generate and read serialized files to get diagnostics.

Change-Id: Iafc25fc70443107a040a995efc038aed35102bbf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-26 13:02:19 +00:00
hjk
4ec4f111cb CMake: Do not store the "title" in the run configuration
This has been superseded by other items, most notably the buildKey.

Incidentally, even Creator 4.6 is robust enough to handle .user files
without the CMakeProjectManager.CMakeRunConfiguation.Title key without
problem.

Change-Id: Iaecb2c15b31ebfb78146c0bec8b955ae821e4499
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-26 12:52:54 +00:00
Tobias Hunger
1de736bb5e ProjectExplorer: Fix warning about nullptr
Change-Id: Iaf1c30560d3ebe12430716808319d059431be30d
Reviewed-by: hjk <hjk@qt.io>
2018-04-26 12:42:44 +00:00
Tobias Hunger
ad8a6cc0e6 ProjectExplorer: Do not use QFlags
Using QFlags here increases the size of a Node by extending the
m_flags from 16bit to 32bit and adds needless padding.

Change-Id: I9169585a7f91da5b85433fcd6f4d1bb7d39e65c1
Reviewed-by: hjk <hjk@qt.io>
2018-04-26 12:42:38 +00:00