summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Only scatter item if they have positionsThomas Hartmann2020-02-141-0/+3
| | | | | | Task-number: QDS-1642 Change-Id: I0e99cfc9027e283d3dc6ce239a74c48bfc092e99 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-02-141-0/+6
|\ | | | | | | Change-Id: Id983ca7f884e7a97ba0de19e1c24f6829f85d96e
| * CMake Build: Skip PCH for targets that do not have QT_NO_CAST_TO_ASCIICristian Adam2020-02-141-0/+6
| | | | | | | | | | | | | | One example is perfparser_lib. Change-Id: I63f20dcba3aedbc8fbf948d30980baf6afd8c110 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: Add new icon fontHenning Gruendl2020-02-142-31/+34
| | | | | | | | | | | | | | | | | | | | - Set unique family name to avoid clash - Add new icons Task-number: QDS-1578 Change-Id: Ic526d2e015a6372d61241bcf1568cced119ab87a Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | ExtensionSystem: Some modernizationhjk2020-02-149-59/+59
| | | | | | | | | | | | | | Mostly 'foreach'. Change-Id: I5390d03bb5cc37c3674b61cea6f5d22bae554ed2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Unify (sub-) project error reportingTobias Hunger2020-02-141-24/+24
| | | | | | | | | | Change-Id: I8916d3aa8e915700717faf62b4a55ce84183221f Reviewed-by: hjk <hjk@qt.io>
* | App/aggregation: Some modernizationhjk2020-02-143-18/+16
| | | | | | | | | | Change-Id: I390e81122453d20a646af4a5bf08edf9de0d9db5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QtSupport: Qt for iOS Examples lists only "ios" tagged examplesAssam Boudjelthia2020-02-141-0/+7
| | | | | | | | | | | | | | Based on change ff7047e. Change-Id: I41f9961d78ccfc001bb5687f17574ef9d81ee2d4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Doc: Link to information about exporting 3D assets from BlenderLeena Miettinen2020-02-141-0/+47
| | | | | | | | | | | | | | | | | | ...for importing them to Qt Design Studio. Fixes: QDS-1470 Change-Id: I47e8a947fecbf0971fdeab32ae41dcaa645cd359 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Doc: Add general guidelines for preparing 3D assets for exportLeena Miettinen2020-02-143-9/+199
| | | | | | | | | | | | | | | | | | These guidelines help optimize the 3D assets for importing them to Qt Design Studio. Fixes: QDS-1431 Change-Id: I267c3897b8da42271948d2b1e45596e3928dbf1f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Vcs: Remove unneeded VcsBaseClient::StatusItem ctor implementationhjk2020-02-132-5/+0
| | | | | | | | | | Change-Id: Idab6f76e86b9ea50b345547017640253a9183126 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Android: don't parse sdkmanager AvailableUpdatesMarkerAssam Boudjelthia2020-02-131-0/+4
| | | | | | | | | | | | | | | | | | | | We don't have logic to parse that part and it's not even needed, because if an update is available the package will be listed in "available packages" section. This is now throwing errors and it's not needed. Change-Id: I3bb65694fbef9218e5a294d9dbfd9e3f1f4c8333 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-02-139-4/+277
|\ \ | |/ | | | | Change-Id: I9bad125a0fb350271f5a61dba22db7357319a49c
| * Bump perfparser to head of 4.12 branchEike Ziller2020-02-131-0/+0
| | | | | | | | | | | | | | Adding CMake build, updated version number and more Change-Id: I62525b3a2239f0cb6c2906e3aedc7cfed2b64d09 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * CMake Build: Add CMAKE_PREFIX_PATH to the HINTS paths for elfutilsCristian Adam2020-02-131-2/+2
| | | | | | | | | | Change-Id: I0d4a8974c943a33e538ee2412258401e89ea3c1f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * BareMetal: Fix qbs buildChristian Kandeler2020-02-131-0/+1
| | | | | | | | | | Change-Id: I5fdd49de0238583134bc1d0711dc354246876884 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Qbs: Fix QC version brandingChristian Stenger2020-02-131-1/+1
| | | | | | | | | | Change-Id: Idb15a97db6637c0218053c3754e09716a52a2f96 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CMake Build: Exclude Dependencies component from ALLCristian Adam2020-02-133-0/+8
| | | | | | | | | | Change-Id: Iedc69399ec2983ecd3359969bf80bdcdfafad37a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CMake build: Fix libexec path on LinuxEike Ziller2020-02-131-1/+1
| | | | | | | | | | | | | | It's just libexec/qtcreator/ without a trailing bin/ Change-Id: I96015dc5c3bb023dabd5b64f1bb9f83bd85b4d51 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Doc: Describe diffing from editor to another fileAndre Hartmann2020-02-131-0/+13
| | | | | | | | | | | | Task-number: QTCREATORBUG-17866 Change-Id: I073f998bb9a00bfcf765766b5690a9dc19209a70 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Add change log for 4.12Eike Ziller2020-02-131-0/+251
| | | | | | | | | | Change-Id: I8c7c713d6b1c81cf6b3f4d944fece12b736cf82d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Fix QDoc warnings issued for Core plugin ActionManager docsLeena Miettinen2020-02-136-44/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings for: - ActionContainer - ActionManager - Command - CommandButton - CommandMappings - CommandsFile Task-number: QTCREATORBUG-23584 Change-Id: I3c7903e054d43143885d67d64309d1ae4429de2c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Doc: Fix QDoc warnings for Locator class docsLeena Miettinen2020-02-137-9/+136
| | | | | | | | | | | | | | | | | | - Fix documentation for documented classes - Mark undocumented classes \internal Task-number: QTCREATORBUG-23595 Change-Id: I15fdb31a7101958106f6a3e7703594d2a5bbe2f8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | TextEditor: Move DisplaySettings closer to new code layouthjk2020-02-132-110/+95
| | | | | | | | | | Change-Id: Ibf095a52f6c689a9f36caf6183e6737bae4e68bf Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | BareMetal: De-Q_OBJECT-ify RunConfigurationshjk2020-02-138-164/+69
| | | | | | | | | | | | | | | | And move to a common .cpp. Change-Id: I288ff21abff4a51251a0c3a0206c852a8862df75 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ScxmlEditor: Make ScxmlEditorFactory independent of QObject inheritancehjk2020-02-134-4/+9
| | | | | | | | | | Change-Id: I11412b850869c8295e9eed9ed74ff4f7dcbcf8b2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | De-Q_OBJECT-ify various IEditorFactory derived classeshjk2020-02-1315-25/+6
| | | | | | | | | | Change-Id: I1470b06d4e10073bb6e4f7ae735f9829fab3bb7b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QtSupport: Qt for Android Examples lists only "android" tagged examplesAssam Boudjelthia2020-02-132-5/+26
| | | | | | | | | | | | | | | | | | | | In the welcome page Examples tab, Qt for Android kits shows all available examples which might not be properly tested or intended for Android. Thus, such a kit should only lists examples tagged for android. Task-number: QTBUG-80716 Change-Id: I22dafb5d5829cb2f6b3c55ff6f2d251c0ee08557 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: De-Q_OBJECT-ify DesktopRunConfigurationhjk2020-02-132-23/+23
| | | | | | | | | | | | | | ... and move to .cpp, and sprinkle some 'final'. Change-Id: I07054cb226afe30f6e1fd89b0518253c8b2d38d5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-02-1353-126/+135
|\ \ | |/ | | | | Change-Id: Ia8d26e0332721c028d942cac33a6d6de3173ba3b
| * Merge remote-tracking branch 'origin/master' into 4.12Eike Ziller2020-02-1343-311/+455
| |\ | |/ |/| | | Change-Id: I60aa7c97c13144d3c31989244517c21a72202ab9
* | Vcs: Remove some indirection in BaseVcsSubmitEditorFactoryhjk2020-02-132-19/+21
| | | | | | | | | | Change-Id: I6ddc818412c9104a06495e2dd8f245de1132e7c2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | LanguageClient: Print json before error messageDavid Schulz2020-02-121-23/+32
| | | | | | | | | | | | | | | | This saves a roundtrip when reporting bugreports where an unexpected error shows up. Change-Id: Id2e7cbd86a456ea794f0791199077f931cab03c5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | LanguageClient: introduce new type for gorgeous formatted errorsDavid Schulz2020-02-1228-237/+319
| | | | | | | | | | Change-Id: Ia76bd768bcb6d33ce66319dddf8cc355a41ffa31 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix assertThomas Hartmann2020-02-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | If in a reaction to auxiliaryDataChanged() we change AuxiliaryData this could trigger cascades and to avoid this we assert. The cascades and assert can be avoided by checking AuxiliaryData before. Change-Id: Id9dd4198041889113fb0e50fdfd4785fddf89f02 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QtSupport: Try harder to ensure that Qt kits have a toolchainChristian Kandeler2020-02-121-3/+39
| | | | | | | | | | | | | | | | | | | | | | If we encounter a kit with a Qt version, but no toolchain, try to find a matching toolchain and set it on the kit. This is helpful if the user forgets to set the toolchain or a toolchain gets removed. Fixes: QTCREATORBUG-23564 Change-Id: I2b29ece81502b10d2a64a431a0edbcd43b1ec3a6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | McuSupport: Inline FlashAndRunConfigurationhjk2020-02-122-21/+19
| | | | | | | | | | | | | | Add a tr() to the label. Change-Id: Iefacd6c6646b9f5e5124d907d0516ebc5556ae76 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Python: Move PyLSConfigureAssistant connection to the pluginhjk2020-02-123-3/+5
| | | | | | | | | | Change-Id: I2d3aecd10d8da7e7272ebca61c0fbeacbc257bd5 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CMake Build: Use install component DependenciesCristian Adam2020-02-124-10/+19
| | | | | | | | | | | | Fixes: QTCREATORBUG-23593 Change-Id: If9861a0ee09f2ce12ac093c2fde600a77958723a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Android: Fix qbs buildChristian Stenger2020-02-122-0/+3
| | | | | | | | | | | | | | | | Amends f46099d21e518c15979dfeb4c3a0d1fee1880095. Change-Id: Idf5405a6cd571eedb0932dbba2c981f63ab59ae3 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
| * VCS: Abstract multi-choice settings in editor configOrgad Shaneh2020-02-134-20/+25
| | | | | | | | | | Change-Id: Iafc089f5ad3796348ab9521b71b31cb645238292 Reviewed-by: hjk <hjk@qt.io>
| * Vcs: Make VcsBaseEditorWidget::test* operate on factories directlyhjk2020-02-1311-33/+34
| | | | | | | | | | | | | | Saves re-discovery by id. Change-Id: I026c1388d02f125147a9b4f5367d7a1a266bff3c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * CMake: Connect CMakeBuildSettingsWidget only to "its" build systemhjk2020-02-121-1/+1
| | | | | | | | | | Change-Id: I1259b3325d633cb89043ce65f8e33b7914f6f06e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * ProjectExplorer: Introduce BuildSystem::parsingStarted/Finishedhjk2020-02-123-4/+8
| | | | | | | | | | | | | | | | Some listeners are only interested in a particular build system instance, not all of one target. Change-Id: Id89bd96c1f7f68bac13886bdc31cb899978d76ac Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * QmakeProjectManager: Fix null pointer accessChristian Kandeler2020-02-121-6/+7
| | | | | | | | | | | | | | | | | | Amends c7d8b9b01c. Fixes: QTCREATORBUG-23596 Change-Id: I466907e02572008d0e677ff29ecd712969f8bc54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: hjk <hjk@qt.io>
| * Remove apparently unneeded QtPlugin includeshjk2020-02-1223-24/+5
| | | | | | | | | | | | Change-Id: I511c0318a72dbf2a92e4749dee02eabfc9826139 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * qbs build: Fix core plugin autotestsChristian Kandeler2020-02-121-1/+1
| | | | | | | | | | Change-Id: I1787dc66992e0484981e9c95ccaa3f4494243845 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Make TextEditor setup more flexibleEike Ziller2020-02-1214-37/+54
|/ | | | | | | | | | | | | | | | | | | | So far it was only possible to combine TextEditorFactory, BaseTextEditor and TextEditorWidget directly. That TextEditorWidget is also directly a QPlainTextEdit made it impossible to "decorate" the text editor widget with something else without a lot of effort. Make it possible to create a text editor factory that returns an arbitrary widget, as long as it can be "cast" to a TextEditorWidget with either qobject_cast or Aggregation::query. That way the TextEditorWidget instance can be attached to the editor widget via Aggregation. Adapt other code that accesses TextEditorWidget from editors accordingly. Introduce a common method how to do that. Change-Id: I72b8721f3a8a8d8281c39af75253e9c80cbe1250 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-123-45/+62
|\ | | | | | | Change-Id: Ie1c4de44aa1af20dfb67e20607b9fb4e71445cbe
| * Editor: Improve splitting format range performanceDavid Schulz2020-02-101-29/+21
| | | | | | | | | | | | | | | | | | Instead of copying the list and move some items individualy from one list to the other use Utils::partition. Fixes: QTCREATORBUG-23281 Change-Id: Iaf9430c041aa916feecf9214303ba30f17290ba8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
View Lorry Controller Status