Commit Graph

64672 Commits

Author SHA1 Message Date
hjk
f922a0bbf1 ProParser: Adapt to QRegExp removal
That's part of a1947aeffe1 in qtbase, with manual adaptation.
It looks like we've been out-of-sync with upstream already before.

Change-Id: Ie6ef9e4fce44e01944194dc27bd3f54274ad7c6f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-24 11:51:02 +00:00
Knud Dollereder
562cf4a867 Implement proper y-axis labeling
Change-Id: Ie2bdb4b85f168dc611a52303143a6a6fc110e3c3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-24 10:51:52 +00:00
Leena Miettinen
351cb8a028 Doc: Describe help filtering from Qt 5.15
Fixes: QTCREATORBUG-24239
Change-Id: Ib91b6ea8df7d3724956d6cad932a0b6d6f9bf1bc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-06-24 10:21:27 +00:00
Aleksei German
27d4f4b663 QmlDesigner: Fix crashes in connection view
- Fix for connections order in view
 - Fix for binding and connection editor init crash

Change-Id: If0faf401b8e89a5548c65f07284138e869612c95
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-24 09:53:50 +00:00
Christian Kandeler
538b097756 Lexer: Fine-tune recent crash fix
Use the original offset only in the one place where it is relevant.
This amends commit 8eac3fba80.

Fixes: QTCREATORBUG-24221
Change-Id: Idcfc5ecc8a76c875c4f2ca5890d0ba95ce52a6e9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-24 08:42:39 +00:00
hjk
8b3e0d7122 Perforce: Remove QRegExp use
Task-number: QTCREATORBUG-24098
Change-Id: Id234cc2206afd3e1372c25749e73d7c31c7ebd7f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-24 08:38:27 +00:00
Orgad Shaneh
15ab47cb3c ClearCase: Cleanup ClearCaseSync
* Simplify regexp matching
* Remove QLatin1String

Change-Id: Id362c8dd0dfe70c96990bd98800e8c4fb886300f
Reviewed-by: hjk <hjk@qt.io>
2020-06-24 08:34:11 +00:00
hjk
bb772ad97c ClearCase: Compile fix for Qt 5.15
Amends 9efa934ae0.

Change-Id: I4ef9caf61f708f94ad2bda6ea826be4567238282
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-24 08:17:24 +00:00
Henning Gruendl
a98c254c59 ADS: Integrate newest base repository commits
* Activate new ADS feature focus highlight
* Remove resources.qrc and related *.svg files
* Clean up new and existing source

Base repository was merged until commit
3de877fe5635ff51a6d1205ca98aad85d204427f

Merged changes from base repository include the following:

* Fix wrong current index when removing a widget from DockAreaLayout
* Fix invisible TabWidget for DockWidgets that are not part of a
  restored state
* Enable ClickFocus for DockWidget to support focussing in case the
  content does not support it
* Move focus related functionality into DockFocusController class
* Add new DockManger config flag FocusStyling
* Add support for focus styling of FloatingWidgetTitleBar
* Improve focus handling when dropping a DockWidget
* Improve highlighting focused DockWidget
* Improve setting of DockWidgetTab focus
* Add styling of focused DockWidget
* Fix docking of floating widgets for macOS
* Fix setting of DockingStateReader file version - use internal file
  version instead of user file version
* Fix saveState() and restoreState() version handling to work like the
  function from QMainWindow
* Fix escape key handling in native window event function if event
  WM_EXITSIZEMOVE occurs
* Implement windows drag handling with native WM_ nonclient area
  messages
* Fix showing DockArea when inserting a DockWidget in a hidden DockArea
* Fix setting DockAreaTabBar index to prevent showing of tab 0 when
  inserting a DockWidget into an area with no current index tab
* Fix wrong insertion order of DockWidget when dropping a floating
  widget to the left or top container drop area
* Fix tab changes position when redocking it to the same position
* Add nullptr check to fix potential nullptr access when closing a
  FloatingDockContainer
* Fix single DockArea cannot be split
* Fix visibility issue when adding dock widget after all other dock
  widgets have ben closed
* Fix FloatingDragPreview flashing of hidden overlay when dragging the
  last visible DockWidget in non opaque docking mode
* Fix FloatingDragPreview preventing dock widget from floating when
  dragging over another dock widget
* Fix DockWidget::setWidget function to test for QAbstractScrollArea
  instead of QScrollArea. Now setWidget properly supports ItemViews like
  QTreeView or QTableView
* Fix wrong display of center drop area when dragging over invisible
  dock area title bar
* Fix bug that drop overlay sometimes was not visible when moving the
  drag preview over a floating window
* Fix dropping of FloatingDragPreview into center of dock container with
  only one single visible dock area. If this happens the dropped dock
  widget needs to get tabified
* Fix crash when trying to make a DockWidget floating in non-opaque mode
  if the DockWidget is not floatable
* Fix DockWidgetTab to provide the right size when starting floating
* Add DockWidget functions setAsCurrentTab, raise, isCurrentTab,
  isTabbed
* Add new config flag HideSingleCentralWidgetTitleBar to enable a
  central single dock widget in the main dock container (dock manager)
  without titlebar
* Fix DockContainerWidget::hasTopLevelDockWidget() and
  DockContainerWidget::topLevelDockArea() to work properly also for the
  main non floating dock container
* Fix ElidingLabel to properly support Qt::ElideNone
* Add setElideMode function to DockWidgetTab
* Add setFullScreen(), setNormal() and isFullScreen() function to
  DockWidget
* Fix takeWidget() function and fixed setWidget() function to handle
  case when there is already a content widget

Task-number: QDS-2180
Change-Id: Ie30648ba329016c91fd19e9b4e12e31e47614b18
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-24 07:56:37 +00:00
Aaron Barany
e5d9cb3779 CMake: Fix nested source groups
Sometimes source groups would start from the root directory rather than
having the correct folder specified in CMake. This was because the
incorrect path was being used to find the relative path. Forward
baseDirectory to the overrideBaseDir parameter of addNestedNodes() to
guarantee the proper directory is used as the base.

Fixes: QTCREATORBUG-23896
Change-Id: I213c02a3fff3c10e4b6a58211600dd16ac257bbc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-06-24 07:29:18 +00:00
hjk
5dd2985a65 Debugger: Use QRegularExpression in QmlInspector
Change-Id: Ib359738c07a5531fe66656bce5ad42c39e4a9ab2
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-06-24 06:28:13 +00:00
hjk
9efa934ae0 ClearCase: Drop QRegExp use
Change-Id: Ia47d2efec42e9df59c5d30a695b4becee942e085
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-24 05:48:56 +00:00
hjk
a6fe2efd4e Bazaar: Replace QRegExp
Task-number: QTCREATORBUG-24098
Change-Id: I450d5756359596495f501759670970c9c541d4d9
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
2020-06-24 05:47:26 +00:00
hjk
f7242cdce9 Debugger: Some compilation with Qt 6
Change-Id: Ifffe68a3c902bbad026919171ac906ae05ec86f2
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-24 05:43:51 +00:00
Artur Shepilko
5be581ddd0 LSP: Fix a compiler warning about signed/unsigned comparison
Change-Id: Id7a7e2372fb968fab077a97e5f7660c1bd52dd20
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 17:26:08 +00:00
Artur Shepilko
3fddc4c475 Debugger: Fix a compiler warning about uninitialized variable use
Change-Id: I9e2ce85b3754bf7c832a8ca32412a2c9900344ef
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 16:31:39 +00:00
Christian Kandeler
fc53bae328 Fix the cmake/RemoteLinux combination
This broke in c2127c9ec4.

Task-number: QTCREATORBUG-21235
Change-Id: I732ce3ad46370141f62fc80792073f5a8ad2f234
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 15:52:56 +00:00
hjk
37a28c1726 Git: Compile with Qt 6
Change-Id: I64d6cbb8fc65ba63a2cdb26246ff0efd29f864b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-23 14:53:08 +00:00
Christian Kandeler
6791ddb27c ProParser: Fix build with MSVC
Strangely, MSVC requires operator< for values of std::list.

Change-Id: I5f62348a69d9b25585798b7824c6538d4cb5df7c
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 14:29:53 +00:00
Eike Ziller
028c0b1cdd Plugin install: Fix crash on cancel
When the process is aborted, both errorOccurred and then finished is
sent. Because of the combination of deleteLater and QueuedConnection
this leads to m_process being already nullptr when finished is sent, so
add some guards.

Change-Id: I446114176f8fa5934b411b39d77c97d6267303fa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-23 13:48:02 +00:00
hjk
611a3bb68a Even more Qt6 porting
Task-number: QTCREATORBUG-24098
Change-Id: Ib6ef0e521483153c9716c9a1870072e836d6b026
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 11:24:44 +00:00
Leena Miettinen
389bcd935b Doc: Describe the Install Plugin wizard
Fixes: QTCREATORBUG-24231
Change-Id: I40f1205f37b6ee3a90460d744fdc8bd3ac0387d0
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 11:19:11 +00:00
Christian Kandeler
a204fa65c8 CppEditor: Do not underline leading whitespace
... when visualizing the range of a code model warning.
Otherwise, warnings covering multiple lines can get too noisy.

Fixes: QTCREATORBUG-18659
Change-Id: Ieff7729d8069e791027f7bdde5fca13f4c7f7163
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 11:01:12 +00:00
Leena Miettinen
e4402e229f Doc: Describe options to automatically fix indentation
Change-Id: Ic0b71c382716bcd267027ccc94c942ba017fe426
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 10:41:15 +00:00
Christian Kandeler
e1c4fcaab5 Toolchains: Fix auto-detection for clang-cl
This broke in aef8255ba0, which removed the collection of MSVC
toolchains in a global variable for clang-cl to inspect.

Change-Id: I949aa0a098ed307d264e8fe23625586018507d00
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 09:21:13 +00:00
hjk
59ddc75b59 ProParser: Drop use of QLinkedList
Effectively 7cba2acd2cc and 0d88721d772 from qtbase.

Task-number: QTCREATORBUG-24098
Change-Id: I88902b358d88e34032f588b9eb0af13c5b9d8675
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-23 09:07:49 +00:00
hjk
fd2236a59a More Qt 6 fixes
Task-number: QTCREATORBUG-24098
Change-Id: I1e30b49218b18f426aea6e4cd3680be513894746
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:59:46 +00:00
hjk
f194b92d0a README.md: Re-use description bits from the manual
Change-Id: I880ddcd3aa6173120aed7a64ee8635b29b9f37df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:53:04 +00:00
hjk
6027c62ab2 FakeVim: Finish port to QRegularExpression
Change-Id: Id4eaab8f41be3b724ddf22f74384a60995cf4aa5
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:52:37 +00:00
hjk
86b7e287d6 FakeVim: Port more from QRegExp to QRegularExpression
QRegExp will not be available in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: Ia1aec515615ecaf8e92ae1a3a1dad92cb999bfb1
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:33:48 +00:00
Leena Miettinen
c7cde7126f Doc: Describe adding multiple keyboard shortcuts for a function
Task-number: QTCREATORBUG-72
Change-Id: I528a77594af1429e92cd65db8c6b4de1eea0126c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 06:27:50 +00:00
hjk
c30eab99e3 Debugger: Port cdbengine to QRegularExpression
Change-Id: Ib957e2696b5bc791ecc0e35676edaf8d0a2467a4
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 05:53:21 +00:00
Volodymyr Zibarov
40173ad4ab C++: Fix auto variable resolving for template class constructor call
Code snippet:
template<class T> struct MyStruct { int value; };
int main() {
    auto s = MyStruct<int>();
    s.value;  // "value" is not found
}

This fixes find usages for unique_ptr declared as auto like this:
auto ptr = std::unique_ptr<MyStruct>(new MyStruct());
ptr->value;

Also fixes in-place constructors:
std::unique_ptr<MyStruct>(new MyStruct())->value;

Fixes: QTCREATORBUG-15364
Change-Id: I8d452a77fe85e63665ec8d4c4afbcf8aad063121
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-22 14:27:49 +00:00
Assam Boudjelthia
a927c320f7 Android: fix sdkmanager detached from AndroidSettingsWidget
This was caused by 7419e09d0f.

Change-Id: I423047d353698798c712f9a32603e955ae1ee15c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-06-22 14:12:17 +00:00
hjk
ee5633dac4 Nim: Initialize NimbleBuildConfiguration::m_buildType
Coverty complains.

Change-Id: I22497e926c32619afac375a7112bb9b62e74a303
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 12:27:06 +00:00
Eike Ziller
ba5b1fc8ab Fix filtering in various hierarchical views
The intermediate "category" nodes where never filtered out.

CategorySortFilterModel was changed to use filterRegularExpression() and
setFilterFixedString does not set that (it only affects filterRegExp()
which we need to get rid off).
Set a regular expression directly instead of a fixed string.

Amends 47e576528e

Change-Id: I6f844027b83d66ca2d5088d83e6e84b01b9eda45
Reviewed-by: hjk <hjk@qt.io>
2020-06-22 12:23:12 +00:00
Eike Ziller
f568648768 Fix .gitignore
Do not ignore _any_ directory starting with "build", just a toplevel one
(which possibly is a CMake build directory).

Amends bd4c9ea250

Change-Id: I1f80db1241e51c4d49d94593cbcaf881c8659cb5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-22 11:53:20 +00:00
Thomas Hartmann
6112b39dcc QmlDesigner: Use font folder for fonts
We should use the fonts folder as default if it exists.

Change-Id: If18714ffa195856f14d7960b46b20992b48faa6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-22 10:32:41 +00:00
hjk
dd9656cf84 Beautifier: Fix freeze in extensionsInitialized
Amends c9a7a3a2d3.

Change-Id: Id14412a584c20e3e14b5c377857af43622ccf65d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 10:12:32 +00:00
hjk
8836cdb75a Core: Drop use of QApplication::globalStrut()
Not in Qt 6, and I don't see a difference.

Change-Id: I4556e48f9ab60b4024ca46a7ed1389b54744c891
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-06-22 09:30:20 +00:00
Christian Stenger
d47f8eaff2 TextEditor: Utils: Do not use invalid regular expressions
Having a search inside a document and switching the find options
to use regular expressions may end up in lots of warnings
regarding using an invalid expression for a match call.
Check beforehand to avoid this.

Change-Id: Ia929090ae3910ff3fa87b57a5718293d2b6ccd04
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 09:19:59 +00:00
Eike Ziller
4a8b3268dd Merge remote-tracking branch 'origin/4.12'
Change-Id: I0935f0087efc1ddd4f17fcafc2e3b5c58c23bef4
2020-06-22 09:33:40 +02:00
Alessandro Portale
3eaf52256a Icons cleanup: Remove unused icons and deduplicate identical pngs
Accordingly Adjust the svg element Ids to new png locations in the
source tree.

Change-Id: I717dd7165c571e69322a1cce8d609f49c6bc75bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 07:12:07 +00:00
hjk
736e6eada0 Various Qt6 compile fixes
Task-number: QTCREATORBUG-24098
Change-Id: Ia0fe92d82d4477bd8f14ee25754b114316fc878a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 07:04:12 +00:00
hjk
e6d1f08642 Drop use of Qt::DefaultLocaleShortDate
Gone in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: Ie9fe1858406133fed6987de0e0a38fe86de15caf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 06:43:39 +00:00
hjk
467fdead9f Core: Remove IFileWizardExtension::allFileWizardExtensions() declaration
Unimplemented and unused.

Change-Id: Id9df5819bea419a0109717f9afa616854996826c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 06:41:46 +00:00
hjk
6896ca3a26 Utils: Introduce a central porting.h for "simple porting stuff"
I figured it might be easier to keep track of active hack here and
also recognized includes that only exist for that reasons in user code
if it's always the same.

Change-Id: I4bf6af493443148cf30a6903d541cd9dc58946da
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 06:30:03 +00:00
Leena Miettinen
71129c9aaa Doc: Describe missing steps in flow view docs
Also describe applying states in flow views.

Change-Id: Icda4559c95f9319845d6c413b33ad5e4016fad5e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-22 06:26:31 +00:00
hjk
3b40809d1c LSP: More Qt 6
Change-Id: I3c4b907c4bc5ee96f4716b03ec238a03704d56a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 05:01:16 +00:00
David Schulz
e323529b3c LSP: Compress document change notifications
Change-Id: Iaf6cb99784f4e1ed1291ace1f4cc18cf6af88672
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-22 04:23:06 +00:00