aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-fix QtCore resource path changing and prepare for Qt 5.134.9Thiago Macieira2019-07-161-26/+19
| | | | | | | | | | | | | | | | | | | Commit 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 added the #ifdef, but that of course only works if you don't upgrade Qt compared to what Qt Creator was compiled with. Instead, attempt both paths and only do that if the system copy is not found. Searching the system copy is required to address Qt 5.13's configure option -no-mimetype-database (used by Linux distributions because the system copy is always present). This code will still need work to deal with Qt 5.14 changes. Task-number: QTCREATORBUG-19600 Task-number: QTCREATORBUG-22636 Change-Id: I6aed4df6a12e43c3ac8efffd15ac952a6e9d4770 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add changes file for 4.9.2v4.9.2Eike Ziller2019-06-251-0/+56
| | | | | Change-Id: Icce93b9daed51603093cf1efe8c904253984351b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Small fixes in French translationRobert Loehning2019-06-241-3/+3
| | | | | | Change-Id: I86816eb8e1d0f7b439532b9196aa28a8119e5234 Fixes: QTCREATORBUG-22613 Reviewed-by: Jocelyn Turcotte <turcotte.j@gmail.com>
* Squish: Fix crash in tst_default_settingsRobert Loehning2019-06-181-4/+9
| | | | | | | On Windows, compilers of type "Clang" display a QComboBox instead of a QLabel Change-Id: I68537259d8d5b38b288308675139c92395f6df62 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix expansion of %DATE% in license templateEike Ziller2019-06-181-4/+1
| | | | | | | | | If the format contains '/', that must be escaped to avoid the expander to interpret that as regexp style replacement. Task-number: QTCREATORBUG-22440 Change-Id: Iaa6c0ae0aa74a055a30b3c0413e325c497f9310f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix bug for with redirect to general landing page Qt bug tracker. Now the ↵Michl Voznesensky2019-06-181-1/+1
| | | | | | | | redirection goes to the page creating the bug Fixes: QTCREATORBUG-18734 Change-Id: I49847edce7da6a993ded3a9538334279965b6eb4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix disabled close button in designer editor tool barEike Ziller2019-06-182-12/+4
| | | | | | | | | | | | | | | It was never actually updating when switching the editor. An update was just accidentally triggered when the designer plugin updated the editor XML when switching modes, which triggered an intermediate document change signal. Get rid of the separate code paths for setting the current editor for "standalone" editor tool bars and the tool bars in editor views, which implicitly corrects the update behavior in the former case. Fixes: QTCREATORBUG-22553 Change-Id: Ieb9f4b53600e1e1b66695ec86164628025df73f8 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix display of keyboard shortcutsEike Ziller2019-06-171-1/+1
| | | | | | | | | Was using wrong foreground color for the "no collision" case. Fix-up of 963dc84cc5d1e412344e3a0fbf4a476541da2d19 Fixes: QTCREATORBUG-22333 Change-Id: I5b4934b69bd9ff2002846ffda700673b6e1cab24 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* ProjectTree: Fix crash when project has no rootProjectNodeTobias Hunger2019-06-141-3/+9
| | | | | | | | | | | | | | | Fix a crash that is triggered by a project returning to a state where it has no rootProjectNode. This can happen when parsing fails and Creator should fall back to displaying the project name and its main project file as it does before any parsing had been done. Unfortunately the hasNode function returned false in this case, so the project model was never updated and the removed project nodes stuck around, triggering a crash. Change-Id: I7616e576773dc52fb6fdff39b9f0a7c7729eac71 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix perfresourcecounter testUlf Hermann2019-06-131-2/+3
| | | | | | | | If qrand() generates a 0, the obtain() is ignored as that is the invalid ID. Change-Id: I608f2687a6ca9a40d905c665a3585bffc1ea5695 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: Do not QTC_ASSERT when Qml support is disabledTobias Hunger2019-06-131-2/+1
| | | | | Change-Id: Ifb84aeb252053e1e6d856650d6ec54c27d589fa0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectTree: Save state of "Hide Empty Directories" filterTobias Hunger2019-06-134-0/+14
| | | | | Change-Id: Iafd7248242e95dc0d5205649747f46d98e05873d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Update tst_HELP04Robert Loehning2019-06-131-4/+5
| | | | | | Task-number: QTBUG-67737 Change-Id: I4808ddccbe4e83d42d24f17a80485b5464822825 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: force rehighlight of next block if state changedDavid Schulz2019-06-071-9/+12
| | | | | | | | | | | | | | | | If the user state of a block changes while it gets highlighted the next block will be rehighlighted too. Currently we store the indentation depth in the block user state. So in order to store the indentation depth _and_ the information whether the next block needs to be rehighlighted we bit shift the indentation depth via the brace depth helper functions from TextDocumentLayaout. And we cannot store the struct KSyntaxHighlighting::State in the block user state (int) directly to indicate that the next block also needs a rehighlight so we toggle just the last bit of the user state. Fixes: QTCREATORBUG-22290 Change-Id: I632f4416a725dc5fa1667bcab34fb2701294c9b8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* SSH: Add missing return statementChristian Kandeler2019-06-051-1/+3
| | | | | Change-Id: Ic109b0b5a022ea462532fbf21736ee7124168608 Reviewed-by: hjk <hjk@qt.io>
* Doc: Update guidelines to improve the quality of screenshots in docsLeena Miettinen2019-06-051-21/+9
| | | | | | | | | Use resolution 1366x768 for taking screen shots and don't resize them. Fixes: QTCREATORBUG-16076 Change-Id: Iecb5eb86586579d7d381824fcbc4b873809952e2 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Fix Windows build build with namespaced QtChristian Kandeler2019-06-041-0/+3
| | | | | | | | For real this time. Amends 8dd8d68bdc. Fixes: QTCREATORBUG-22305 Change-Id: I61133f76b7e39a2b0168f8a6c19721231d443807 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Revert "Work around OpenGL issue in macOS 10.14.4"Eike Ziller2019-06-041-0/+2
| | | | | | | | | | | Fixed in macOS 10.14.5 This reverts commit 4bdfaafc4246771bf1cbc87968287f5af5098362. Task-number: QTCREATORBUG-22215 Change-Id: I33c0965e22d61a9a745ed05dd330f6e938ceb3e1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 9645687e539bd0ea286fb4136329458c3db3694e)
* QmlDesigner: Fix crashqds/v1.2.0Thomas Hartmann2019-05-291-1/+2
| | | | | | | Task-number: QDS-778 Change-Id: I808238e3123c4020b0fb4a7ef4e41dd95756c58a Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Squish: Remove unused functionsChristian Stenger2019-05-292-30/+0
| | | | | Change-Id: If53390d65b9013c42f7dcf5834b4caee2bcb8766 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Squish: Remove unused filesChristian Stenger2019-05-294-463/+0
| | | | | Change-Id: I2c88692fa941ff4e34eb7e2a2ecf729771e7afca Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* add QTDS doc used image folders to dev packagesTim Jenssen2019-05-281-1/+15
| | | | | Change-Id: I06b38d9b66833ee161728e7dfad2e11a5afd4f81 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.9.2Eike Ziller2019-05-282-4/+4
| | | | | Change-Id: I29e0f3c2e5f4569b2a23961b6980740501915cb3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Add try catch blocks for anchoringThomas Hartmann2019-05-271-146/+290
| | | | | | | | There have been casual unreproducible crashes. This kind of code should be replaced by using lambdas in master. Change-Id: I5b44a4c7b013f70a012c22ff9610e5579b165ab4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update 4.9.1 changes fileEike Ziller2019-05-271-0/+2
| | | | | Change-Id: I5f6ea48265de11088e5028f38430c3bac373babd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix issue with list propertiesv4.9.1Thomas Hartmann2019-05-251-0/+6
| | | | | | | | | On pure QML types list properties were reported as list properties. Task-number: QDS-687 Change-Id: I34b1688953185b65d64c299c72c8170d7daa789b Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Add more change log for 4.9.1Eike Ziller2019-05-241-0/+8
| | | | | Change-Id: I5471bc8ae879f200b785d7c67022250103f5fa01 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update qbs submoduleChristian Kandeler2019-05-241-0/+0
| | | | | | | To HEAD of 1.13 branch. Change-Id: I111966cef702d28d75a50180f13c034c68a6135c Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Squish: Update commentsRobert Loehning2019-05-241-2/+2
| | | | | Change-Id: I10dc06b257ae82e454a47d21086b481f8bca7654 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: don't disable widgets on configuration errorAaron Barany2019-05-241-6/+0
| | | | | | | | If the configuration failure was caused by an incorrect option, you want to be able to fully use the UI to fix the issue. Change-Id: I3048b1f6e0b4d88e90433df9a36ca18fa72c03c6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlDesigner: Properly reset line edits if an error occursThomas Hartmann2019-05-222-2/+20
| | | | | | Task-number: QDS-707 Change-Id: Ic70c4296afd8bd6b590242fea129624af2fee7a6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix stupid bug in resource browserThomas Hartmann2019-05-212-5/+12
| | | | | | | | We were keeping skipped files as empty files. Task-number: QDS-227 Change-Id: I5d7fca348e29d1accf3db29661a9d274b5b0f998 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix regressionThomas Hartmann2019-05-212-33/+39
| | | | | | | | | This regression was caused by an optimization. I added updatePath() to avoid similar issues in the future. Task-number: QDS-690 Change-Id: I0c1c67a3d35a6944da494651db34c746561a1e26 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Improve readability of names in the easingcurve editorThomas Hartmann2019-05-212-6/+26
| | | | | | | | | | | | - Increased item size - Decreased font size - Changed text background color - Added tooltips - Elide text in the middle Task-number: QDS-394 Change-Id: Ia796bfb0fbf25bee3ad8d2dd7c697163607426a4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix issue with gradient editingThomas Hartmann2019-05-211-3/+6
| | | | | | | | | | | The gradient only has to be deleted if we are in gradient editing mode. If we are not in gradient editing mode, we should not delete any gradient. This was creating issues when editing border.color. Task-number: QDS-675 Change-Id: Ie3fcbc4a817cb0062e895298d42794b7338084d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Code clean upThomas Hartmann2019-05-211-1/+1
| | | | | Change-Id: Ie396426df1060805fb39024fa6da6e758203099a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Squish: Update tst_qtquick_creationRobert Loehning2019-05-202-26/+11
| | | | | | Task-number: QTCREATORBUG-20056 Change-Id: I5a7e239b9c65b32e2bc57dd594cc96bdda94b472 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Remove unused workaround codeRobert Loehning2019-05-201-76/+16
| | | | | | | | We have not been using this for more than a year. Instead, we seem to prefer having workaround code inline. Change-Id: I37066f359eac5eda62c9c9acfcae3b89f980d024 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Add missing else statement to color editorThomas Hartmann2019-05-201-1/+2
| | | | | | | Task-number: QDS-685 Change-Id: Id941aaa19cb727e020ca1021a452aba32ba493ee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Testproject for meta info hintsThomas Hartmann2019-05-2010-0/+414
| | | | | Change-Id: I610f6180fb8b26d0bc84cd291781da2f06179b7a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix error messageThomas Hartmann2019-05-171-6/+10
| | | | | | Task-number: QDS-664 Change-Id: Iba5b8917908c6a1e9068e813ca09f8ebe70a7a12 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Update animations when deleting timelineThomas Hartmann2019-05-171-0/+1
| | | | | | Task-number: QDS-663 Change-Id: Ieb0a8ea41cdd788e97ed1479026fe1c08b0196f1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Revert "Perforce: Allow working with localhost server"Orgad Shaneh2019-05-171-0/+17
| | | | | | | | | | | | | It breaks the common use-case. Running p4 client -o in any directory returns Host, even if it is not managed by Perforce. This reverts commit 28f7c7935f4d142d5498d58465ff004462e996a6. Fixes: QTCREATORBUG-22458 Change-Id: Iaa84ff68e2c6d807c6c177ff2113b07380b4e5be Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Doc: Add links to Qt Quick Studio Components' documentationLeena Miettinen2019-05-161-5/+5
| | | | | | | Depends on a change that adds the docs to the Qt Design Studio Manual. Change-Id: I8ef7d9085d0672daba9d0d2a3f64f473d8e8e9cf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Adjust gradient dialogThomas Hartmann2019-05-163-18/+19
| | | | | Change-Id: I21eea31024c6fc959dd27654711607f3ff8a4d49 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add a link from "Adding States" to "Binding Animations to States"Leena Miettinen2019-05-161-1/+5
| | | | | Change-Id: I49a28ed75a2bade67a4f550ccf303b409f9600d3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Edit docs for the Connections viewLeena Miettinen2019-05-154-26/+39
| | | | | | | | | | - You have to double-click the values of columns to edit them - For properties and bindings, the values are set for the currently selected item and the item column displays the item id (read-only) - Add links to examples of using the view Change-Id: I8c27dbbcbbf269f52102ca2af37f872c86e56155 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix error message when adding empty qmake project as subprojectChristian Kandeler2019-05-151-1/+2
| | | | | | | | | | | | | | The JSON wizard code expects that at least one file gets opened either as a project or in an editor. This was not true when adding an empty qmake project, because its .pro file loses the "open as project" property when added as a sub-project, and there are no other files to open. We fix this by also setting "open in editor" for the .pro file, which makes sense (also for the top-level case), because a user is likely to add custom content there right away. Change-Id: Icdf68bccb2488bdb26b6b3c8410da901a4eb32df Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Refer to the SvgPath component from the PathView component docsLeena Miettinen2019-05-151-0/+4
| | | | | | | Qt Design Studio -specific. Change-Id: I172c94c69dcdc321c2dc8d1e37d229861966ffb2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Make "Browsing ISO 7000 Icons" topic creator-onlyLeena Miettinen2019-05-153-8/+6
| | | | | | | | While this works in Qt Design Studio, it is easier to use a dedicated Qt Quick Studio component called Iso for this purpose. Change-Id: I6f2d430ae050b7e0a204077f92ae54987c47f6b7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>