summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ClangRefactoring: fix compileDavid Schulz2020-07-061-4/+2
| | | | | | | | Amends: 2915ee0832f33616a5582e9f6484c3d05c14a453 Change-Id: I06aa40fedcdca8c9cdf1e731ba068c9c6cf94ca6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Git: Fix whitespaceAndre Hartmann2020-07-041-2/+2
| | | | | Change-Id: I9b61d018179449f61fd38de7957fabc1c9bc917d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core: remove impractical offset member of text positionDavid Schulz2020-07-014-23/+18
| | | | | | | | | It is just accessed when getting the length of multiline ranges and in that case we can pass the string that range is used on to calculate the real length. Change-Id: I3fe95ac0cd4b05a08924a5285a75ebc5eed2423b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.14 betaEike Ziller2020-07-013-9/+9
| | | | | Change-Id: I299dfae2c9422c1f02c3357109d426beaadbec7e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-07-0166-307/+513
|\ | | | | | | | | | | | | Conflicts: src/plugins/android/androidsettingswidget.cpp Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
| * QmlDesigner: Fix compile with Qt 5.12Christian Stenger2020-07-011-0/+1
| | | | | | | | | | Change-Id: I630496ae7351026d207fb5c87e2eb32e2d2aff34 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Doc: Clarify what happens during export and import with Qt BridgeLeena Miettinen2020-07-016-54/+63
| | | | | | | | | | | | Fixes: QDS-2433 Change-Id: Ia30957863c7200eb0438db4e271e5c2be0208637 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
| * Target selector: Fix drawing of the run iconAlessandro Portale2020-06-301-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new layout calculations (see QTCREATORBUG-24148), the option rect can now be used to center the icon with the provided functions in QRect. The current code kind of works if RunColumnWidth matches the row height, so that it can do things like subtracting vertical from horizontal dimensions. But in fact, the icon is not centered on the option.rect. fillRect(option.rect, Qt::red) <-to verify. Apart from that it has a few more downsides. This change: - Uses the run icon made for dark background - Paints the icon at its native 16x16px (instead of 15x15px) - Uses QRect::center()/moveCenter() to actually center the icon Change-Id: Ib280c650bd454b551f9e30ca108579fee06d81f0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * QmlDesigner: Fix testsThomas Hartmann2020-06-301-1/+1
| | | | | | | | | | Change-Id: I74442bf004a462d5d310f128b64f8bc82073d822 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Wizards: Update templates in regard to deprecation warningsChristian Kandeler2020-06-3010-82/+13
| | | | | | | | | | | | | | | | | | | | | | The QT_DEPRECATED_WARNINGS macro has no effect anymore, so let's remove it along with the huge chunk of comments that took up an inordinate amount of space in the resulting project file. The concise comment for the QT_DISABLE_DEPRECATED_BEFORE macro is perfectly sufficient. Fixes: QTCREATORBUG-24244 Change-Id: I549c16c2c037bb64c2833e4807047ab3a8b2103f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Meson: Fix build with older GCCChristian Kandeler2020-06-301-1/+1
| | | | | | | | | | Change-Id: I3a3ed1ea65e066e73d3cabb29a8858677197f18f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * CMake build: Make option to include dumper tests discoverableEike Ziller2020-06-301-0/+1
| | | | | | | | | | Change-Id: I9828f362561b8392d31a56f8a60fe9531accf4ce Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * CMake build: Remove timeout for dumper testsEike Ziller2020-06-303-3/+15
| | | | | | | | | | | | | | | | | | They take much longer, but are also optional. Makes it possible to run via e.g. "ctest -V -R tst_debugger_dumpers" Change-Id: I8bbda6ca36e25cd896b1f3be5d1696a27b8acc53 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| * Doc: Fix menu paths to submenus and items that moved to View menuLeena Miettinen2020-06-3014-20/+21
| | | | | | | | | | | | | | | | | | The Views and Workspaces menus as well as some menu items were moved from Windows to View. Change-Id: I2e196c09f0e9e2bf8ef1623167ec3e87ed1f77f5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Android: remove unnecessary validateNDK function and ticksAssam Boudjelthia2020-06-301-31/+2
| | | | | | | | | | | | | | | | The NDK is installed via sdkmanager anyways, and custom NDK paths are verified upon choosing in the file dialog and rejected if not valid. Change-Id: I18f876dfacdbc1045679c6b082a500527a933673 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Android: remove "Bundle" from ndk nameAssam Boudjelthia2020-06-301-1/+1
| | | | | | | | | | Change-Id: I5368d77cfe3e94560fb897bfd0213fc3dec74d55 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Target selector: Make sure the run icon is not hidden under scrollbarChristian Kandeler2020-06-301-2/+7
| | | | | | | | | | | | Fixes: QTCREATORBUG-24148 Change-Id: Icae939d8f63a99b372f32d91d33acdfb2130a4f7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Meson/Doc: Initial documentation for Meson build pluginAlexis Jeandet2020-06-3014-5/+227
| | | | | | | | | | | | | | | | | | | | | | | | Mostly copied from CMake and adapted to Meson. qtcreator-kits.png screenshot has been taken on Linux but https://doc.qt.io/qtcreator/creator-targets.html#specifying-kit-settings has Windows specific stuff (item 11. "Select the Force UTF-8 MSVC compiler"). Fixes: QTCREATORBUG-24216 Change-Id: Ie6c3c48fea7f1732f010eb10cbb152406e08810c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Meson: Trivial fix for testsAlexis Jeandet2020-06-292-2/+2
| | | | | | | | | | | | | | Meson sample folder was renamed without updating tests. Change-Id: I95b984b6d18a43e0f570368b76b669376fff4f0e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * QmlDesigner: Turn the 3D edit light on initially for lightless scenesMiikka Heikkinen2020-06-291-2/+14
| | | | | | | | | | | | Change-Id: Ib840adec751604f08b5135b3e3088b7ce663685a Fixes: QDS-2316 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Change style of connection viewMiikka Heikkinen2020-06-292-15/+2
| | | | | | | | | | | | | | | | Style updated according to UX specification (QDS-2201). Change-Id: Id1bf1fec0a5f0e742c1f5146d905800b53ed5125 Fixes: QDS-2437 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Handle active scene id change properly on edit 3D viewMiikka Heikkinen2020-06-292-1/+23
| | | | | | | | | | | | | | | | | | | | The scene id shown on the corner of edit 3D view is updated and toolstates are also stored under the new id. Change-Id: Ib3ac2f2bb829a5d908e22932c313c76bd4143592 Fixes: QDS-2277 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Update 3D edit view on state changeMiikka Heikkinen2020-06-292-0/+8
| | | | | | | | | | | | Change-Id: I56b16afe4d9ccab802d6e07f60b57e46a353cc26 Fixes: QDS-2378 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Fix crashThomas Hartmann2020-06-291-0/+3
| | | | | | | | | | Change-Id: I67c2a97e44c2bdc6973c2a3d3cbc222c46b1c461 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Meson: fix broken project tree on windowsAlexis Jeandet2020-06-293-28/+30
| | | | | | | | | | Change-Id: I88d0e5b6f1547d5fa6fe832d26bafee59e535a4b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * QmlDesigner: Fix qbs buildChristian Kandeler2020-06-291-1/+2
| | | | | | | | | | Change-Id: I6abaeebf4bb37bc676ecea6d34bd9484b09054a7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Merge "Merge remote-tracking branch 'origin/master' into 4.13" into 4.13The Qt Project2020-06-2910-33/+45
| |\
| | * Merge remote-tracking branch 'origin/master' into 4.13Eike Ziller2020-06-2910-33/+45
| | |\ | | | | | | | | | | | | Change-Id: I918d82b4e11cc9aa3c361bb439019403b93afa96
| * | | Android: move non UI functions from settingsWidget classAssam Boudjelthia2020-06-293-50/+52
| | | | | | | | | | | | | | | | | | | | Change-Id: I2d6c6806fc8b219b65d241a0243ee1edab5125a1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | | ProjectExplorer: Do not activate kits via right clickChristian Kandeler2020-06-291-0/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in the target selector. When requesting the kit context menu by right-clicking, we get extra mouse events on Windows that activate the kit, which is annoying to users. Suppress these events. Fixes: QTCREATORBUG-24156 Change-Id: I8a5de927634dfdfafb54d265ab31763c6120a527 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | Fix coverity warning: Initialize resultKnud Dollereder2020-06-301-1/+1
| | | | | | | | | | | | | | | Change-Id: I95a094ecd24e78dd452a58b0757a9ae69c81a555 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | ADS: Fix uninitialized memberHenning Gruendl2020-06-301-1/+1
| | | | | | | | | | | | | | | Change-Id: Iffbe8aef11a705930da3c3ab22ac61ab7139b9f9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Doc: Describe moving types and symbols in Outline viewLeena Miettinen2020-06-301-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-21993 Change-Id: I2a156549e8eb8c5f31e505edeb3ab5f741be0245 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* | | Revert "McuSupport: Bump supported Qt for MCUs version from 1.2 to 1.3"Alessandro Portale2020-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09cb6d0d1e737aa20975288d2dfaf0e669a4326d. Reason for revert: <INSERT REASONING HERE> Change-Id: I463f10f1f25e610d1e7b9e8d84d8a8564f5a26f3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | McuSupport: Bump supported Qt for MCUs version from 1.2 to 1.3Alessandro Portale2020-06-291-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-24203 Change-Id: I378dca375bcd9a533c585369bb61c2c329a8a1d1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | QmlDesigner: Property Editor cleanupHenning Gruendl2020-06-292-306/+339
| | | | | | | | | | | | | | | | | | | | | * Put align distribute section in separate file Change-Id: I8f0219f32f847c11733833164c5287af5df429cd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | QmlDesigner: Set height according to active tabHenning Gruendl2020-06-291-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add binding to current tab height * Remove unused specficsOneHeight statement Task-number: QDS-2051 Change-Id: Ia1ac6af4e65d3de5e1db96f2bcc2d1ec8eb08312 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Android: Fix default (Android Studio) Sdk path for WindowsAlessandro Portale2020-06-291-1/+2
| |/ |/| | | | | | | | | | | | | By default, Android Studio on Windows puts the SDK into: %LOCALAPPDATA%\Android\Sdk Change-Id: Iadbb1cb5c15c6cdb581cbe07b2a0e83ac11e384e Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.13'"The Qt Project2020-06-29130-317/+7694
|\ \
| * \ Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-06-29130-317/+7694
| |\ \ | | |/ | | | | | | Change-Id: Ie67085fcbb4150c60f0253312e19a82b95b4a898
| | * Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13The Qt Project2020-06-29123-307/+7673
| | |\
| | | * Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-26123-307/+7673
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
| | | | * qmldesigner: enable Transion in QmlUi filesTim Jenssen2020-06-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e35e8a2dc7b946297c70fd775bd3e3366295271 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | | | * AssetExport: Add generated UUID to qmlVikas Pachdha2020-06-265-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable the merge when importing back from Photoshop Task-number: QDS-1555 Change-Id: I411ad65af1a33a80fcea80206aef93e2d1afa357 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | | | * AssetExport: Export assets from renderable nodesVikas Pachdha2020-06-269-5/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QDS-1555 Change-Id: I3d5b60ee8214aeee054587f45045beea020d1f13 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | | | * AssetExport: Refactor to accommodate asset generationVikas Pachdha2020-06-268-31/+55
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57b33dc06819b3f0d1269eae10bd1131c5cb911d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | | | * QmlDesigner: First implementation of TransitionEditorThomas Hartmann2020-06-2627-0/+4282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14391e872f6a257a2cdf75e7d577de64c384c1fd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | | * QmlDesigner: Break dependencies in the timeline graphics viewThomas Hartmann2020-06-2618-124/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to reuse big parts of the timeline infrastructure. To allow this I introduced AbstractScrollGraphicsScene and other view can derive from it to implement similar behaivour. Change-Id: I4a4d2d5711d4a4fbb4cf7af29f689459ccf89f00 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
| | | | * qmldesigner: remove unreferenced variableTim Jenssen2020-06-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id76291e2621744a91ae4eb78d3941086ee7facd7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | | | * qmldesigner: reduce noiseTim Jenssen2020-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes unnecessary: "PropertyEditor: invalid node for setup" while reseting the view. Change-Id: Ib4583e97ed5a52ff87116e4231f4bf6b4f4cc7e5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
View Lorry Controller Status