Commit Graph

67787 Commits

Author SHA1 Message Date
Eike Ziller
15588ea166 CMake build: Link qtcreatorcdbext statically
As in the qmake build

Fixes: QTCREATORBUG-24252
Change-Id: Ifb6b375dfe515bb5ace2e70fcd2282d25b919ed5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-25 13:30:31 +00:00
Aleksei German
4ed146035e QmlDesigner: Fix for Connections visibility
- Fixes an issue with connection model not finding Connections in 5.15

Task: QDS-2412

Change-Id: I07bbb900907aaaebccdd90dbc1f037ee0b2fcc61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-25 13:13:05 +00:00
Eike Ziller
c0770313f3 CMake: Fix changing build directory
It wasn't possible to change the build directory if the old directory
didn't already contain a build.

Amends 7e6e02eb08

Change-Id: I741f6981273a4e04cceabde5b15b5ad951535ef8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-25 13:07:22 +00:00
Leena Miettinen
31efb97e3c Doc: Describe the Add Forward Declaration refactoring action
Task-number: QTCREATORBUG-23444
Change-Id: Iaa38197a6e37b3507aad8ca756a94fa1eb05633b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-25 12:56:00 +00:00
hjk
158dee7eb6 Android: Move connections out of .ui
... and make them compile when using Qt 6 uic.

Change-Id: If5a9a052c62aa2641c60378bb26916325aed628e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-25 12:44:51 +00:00
Thomas Hartmann
72302cac49 QmlDesigner: Remove old QtQuick 1 code
Change-Id: I523419689ab7667900de6ca72aa736e14064ab34
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-25 12:03:54 +00:00
Thomas Hartmann
b96b0e4230 QmlDesigner: Remove old QtQuick 1 code
Change-Id: I523419689ab7667900de6ca72aa736e14064ab34
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-25 12:03:23 +00:00
Thomas Hartmann
a381d8efc8 QmlDesigner: Fix crash on puppet
Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-25 12:02:57 +00:00
Leena Miettinen
b127088992 Doc: Describe new language server features
Change-Id: Id5d241777bd79196638596a582c685df4f335edf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-25 11:58:27 +00:00
Knud Dollereder
6dda9d360d Add missing include
Change-Id: I870cf23c4ae994b67a3e938dae767b7f553deb56
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-06-25 11:23:42 +00:00
Alessandro Portale
b5ffff28ce Android: Make OpenSSL clone progress dialog application-modal
We need to hold the user off from doing funky stuff while cloning, like
for example from pressing the clone button multiple times in a row.

Change-Id: Ib20218e0b0fa28852412da2b71ec5ba410d682e8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-06-25 11:11:04 +00:00
Alessandro Portale
143ff3e126 Android: Trigger PathChooser validation after OpenSSL cloning
In case the path was non-existent before the cloning, it should not be
"red" anymore after cloning.

Change-Id: If33cfbd07710e317505a9fe1e4b3b9f19a10d5db
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-06-25 11:10:08 +00:00
Thomas Hartmann
3c5f3547fb QmlDesigner: Properly resolve "dot properties" for dynamic objects
property NumberAnimation numberAnimation: NumberAnimation {
}

In this case this will expose the "dot properties" of numberAnimation.

Change-Id: I40aafcc4f762ab6297c0829674ac62d92cbd713d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-25 11:10:05 +00:00
Assam Boudjelthia
998c07dcbe Android: handle more potential fails for when cloning
Fixes: QTCREATORBUG-24200
Change-Id: I3f54f0610a70654c3711e7dc3bfd5f22863b2cd2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-25 11:09:36 +00:00
Leena Miettinen
cb5b0cffb3 Doc: Describe starting Python interactive shell with options
Change-Id: Ife42fd2313b4855686abf12fd536e024f7650ef9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 10:05:53 +00:00
Venugopal Shivashankar
33a91ab099 Doc: Update the MCU options dialog screenshot
In addition, document the option to create and
remove a kit for the chosen SDK.

Change-Id: I90c405d12ad6bc5d369453f70049b4fe9dd03962
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-25 09:44:23 +00:00
The Qt Project
aba5ecb363 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-06-25 08:11:07 +00:00
Thomas Hartmann
ad17ea9611 QmlJS: Fix false positives for Connections
Connections and ListElement are in the QtQml scope,
when using type information from Qt kit.

Change-Id: I6236a317117e15f4b68c0642186bfdb91d0c92db
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Christian Kamm <mail@ckamm.de>
2020-06-25 08:10:43 +00:00
Miikka Heikkinen
3dc946374b QmlDesigner: Insert dragged material into parent model's materials list
When a material is dragged from item library into a Model nodel in
navigator, the material is automatically inserted into
the model's materials list.

Change-Id: I9a9bd10c433a4fead037ddac8238c14cdc91e3c4
Fixes: QDS-1651
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-25 08:07:56 +00:00
Miikka Heikkinen
60ff6b6577 QmlDesigner: Improve usage of QML items as quick3d textures
Quick3D Texture elements require some window signals to show QML item
as texture, so we fake them to make textures appear in form editor
and state preview. To prevent texture mirroring, flipV value
is force set at proxy creation. To keep state preview up to date,
we trigger multiple render passes if there are any QML items used
as texture sources in quick3D textures.

Task-number: QDS-2290
Change-Id: I16c34aad943213c0b737fdb073333be3bbd40f2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-25 08:07:41 +00:00
Eike Ziller
7c329e1902 Merge remote-tracking branch 'origin/4.12'
Change-Id: I4935b6afdb13627f32e850a4c8b536de0269bc4b
2020-06-25 09:28:57 +02:00
hjk
c6b9a03b39 ADS: Make it compile with current Qt dev
Change-Id: Ibea7545b443341da5d079900edcc32439a47c12f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-25 07:18:17 +00:00
hjk
03838decb9 More QRegularExpression and include for Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Ia537e26efd3f37319c38d906e569b255768371f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 07:13:43 +00:00
Federico Guerinoni
5a091c3d98 ExtensionSystem: Make API for revision in PluginSpec
Change-Id: Icdc6bfa565cf67faa829fd473f2890e4987bd261
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 07:08:06 +00:00
Eike Ziller
0238bff7d5 Plugin install: Make 7z verbose
Change-Id: I1f2dbb607f8c38018f6ee8631539caef1213ee8f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-25 06:58:22 +00:00
Leena Miettinen
0ce677b9e9 Doc: Describe the Analyze File button on the code editor toolbar
Change-Id: Ibf9dca943f925db9dbfd82d8bc2e5505428994dc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 06:35:27 +00:00
Friedemann Kleint
2bc4d82d31 Fix crash opening UI files
Add a null check, amending
aaa1376576.

Fixes: QTCREATORBUG-24241
Change-Id: I63e76b9d2dd10034b637f8f3cac5001b15b35d30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-25 05:26:14 +00:00
Fawzi Mohamed
96c1b4119e QML: ensure that signal treated like functions/slots in completions
Renames enumerateSlots -> enumerateMethods to mirror the new usage

Fixes: QTCREATORBUG-24124
Change-Id: I31ac7d5f4bf568e1ab9c9463b1ebd0011dfcb9d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-24 22:44:16 +00:00
Thomas Hartmann
f26c51d562 QmlDesigner: Add missing static
Change-Id: Ic71aeeb8f6cf65944672a0f1d09f2d70e824d760
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2020-06-24 15:10:07 +00:00
Artur Shepilko
f3c2f68c39 Sqlite: Fix a compiler warning about unhandled switch-case
Change-Id: Id9cb6ebd6db7f718f8aa3e25d56581f953ad182e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-06-24 15:04:20 +00:00
Thomas Hartmann
3cb12a51ce QmlDesigner: Increase default for canvas size
Change-Id: Id37aaa5bca253751781c02f9dc44343db137069a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-24 14:56:36 +00:00
Thomas Hartmann
aa8bf1f448 QmlDesigner: Add properties for sorting
Change-Id: I887e3b06ca3accc243283e1ac0895ab81bbdf513
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-24 14:56:10 +00:00
hjk
00f685cba4 Valgrind: Replace QLinkedList
Task-number: QTCREATORBUG-24098
Change-Id: I611bab2bbd47c969c64037173f5ea68240ca28ff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-24 12:56:29 +00:00
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
Friedemann Kleint
848054ce3c Add shiboken2tasks.py for converting Qt for Python's shiboken tool warnings
Add a tool for converting shiboken  warnings to task files to be
able to load them into the Issues pane of Qt Creator.

Task-number: PYSIDE-904
Change-Id: Ie28e93ad76a615e549594edf5bba60e134b46a88
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-24 09:03:00 +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