aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-05-061-4/+1
|\ | | | | | | Change-Id: I831e9d65be0009d0fd98c19aa38fa6fb69eed421
| * CMake build: Fix copying of Clang headers to buildEike Ziller2020-05-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | - "copy_directory dir target_dir" copies the contents of "dir" into "target_dir" so we need to specify "include" at the end of the target directory - copy_directory creates directories as needed Fixes code model and analyzer errors when running without previous deployment Fixes: QTCREATORBUG-23910 Change-Id: Id63dd790f89f720593cd0508241f79dfaddac794 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-05-052-13/+42
|\| | | | | | | Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
| * Theme: add design studio controls theming to theme color listBrook Cronin2020-05-051-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've chosen to add the controls themes colors to the main color list for couple of reasons. 1.) Adding the colors to the main color list allows them to be used from the QML constants file that defines the controls color theme, in turn allowing us to customize the look and feel of all controls on a per theme basis. 2.) I have added new colors instead of using the existing ones because of the ripple effects of modifying existing colors in the themes, i.e that often when you want to change one particular color in the UI modifying the value of existing colors in the theme has the unintended consequence of changing other parts of the UI. Thus adding a specific set for the controls allows us to have a fine grained approach to modifying the controls in any theme without disturbing the other elements of the existing UI theme. Change-Id: I16fb0458c870d01f68ed626676a665117628c917 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlJS: Fix line number for string literalsChristian Stenger2020-04-291-1/+3
| | | | | | | | | | | | | | | | | | | | When a string value's first line ends with an EOL the line number for the next line got wrong which in turn confused the syntax highlighter. Fixes: QTCREATORBUG-23777 Change-Id: I37eed839a2e63cf470b9bc2ac0596ab8bc8d373c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * QmlJS: Fix lexer handling of escape sequences (again)Christian Stenger2020-04-291-11/+2
| | | | | | | | | | | | | | | | | | | | | | The lexer handled escape sequences already, but not fully correct. This effectively reverts 63db0f271fd2f and fixes the wrong offset. Task-number: QTCREATORBUG-23830 Change-Id: I2cc1e9df5c0218cf9ee80998adce69bbc2eb4dab Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-289-52/+158
|\| | | | | | | Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
| * CMake: build fix for unittestsCristian Adam2020-04-281-1/+1
| | | | | | | | | | Change-Id: I1ead13e7b764a346ac49004ead2bf9ab6362ffb5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * ADS: Integrate newest base repository commitsHenning Gruendl2020-04-246-51/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 998fe9fa11939eb28dd021ca11d5302c4fe2a005 28dc374fc25fcf5a4100c7ad929cb8da690530ed 0e88467f94194d5bea209f6ddc364358ab92899e d0f4ce324890197683869eafda0f3938ae619b8d c541f2c69b519eceb76ffc54589175c9fd0da8a6 37d305e50d2c0829f031b71a61e290361eea9f07 - Fix/workaround for escape key issue with remaining overlays - Clean up if statements according to style guide Task-number: QDS-1883 Change-Id: I44ddaed67458a75aca91bdd74cd2b5890bd23c38 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * CMake build: export less generic public includesEike Ziller2020-04-243-1/+7
| | | | | | | | | | | | | | | | | | Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Add StyleHelper functions for icon fontThomas Hartmann2020-04-272-0/+48
| | | | | | | | | | Change-Id: I783f3405dafbd51bf7433084709a2362ed2bd759 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Extend icon font supportThomas Hartmann2020-04-275-24/+32
|/ | | | | | | | | | | | | * Use ADS::IconProvider to make use of font icons * Add support for IconProvider in FloatingWidgetTitlebar * Add support for named font icon entities in QmlDesigner::Theme * Add level of indirection to Constants.qml to be able to parse it from inside C++ * Add color and HighDPI support in stylehelper * Update icon font and related constants Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: evaluate expression before assigning when using python dumperDavid Schulz2020-04-241-40/+60
| | | | | | | Fixes: QTCREATORBUG-23711 Change-Id: Ic386b3e4bdd948e74f52116248de1b33a35fe03a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlJS: Fix palette supportChristian Stenger2020-04-243-0/+31
| | | | | | | | | | | Fixes false positive warnings of having no members and allows to auto-complete its members. Fixes: QTCREATORBUG-23659 Change-Id: I4da43b9d3f005f9c6cc759ec424bf67062beff78 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlJS: Fix lexer handling of escape sequencesChristian Stenger2020-04-241-1/+11
| | | | | | | | | | | Escape sequences inside strings need to get handled explicitly to avoid wrong length and offsets of tokens to avoid follow-up problems while highlighting or symbol interaction. Fixes: QTCREATORBUG-23830 Change-Id: I4ab0b166bbab22ef3b7b54071e128416a14e97e1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* languageutils: improve ComponentVersion::toStringTim Jenssen2020-04-231-2/+6
| | | | | | | | After benchmarking it on a i7 it was 20% faster in release. (in debug even more) Change-Id: Ibf4599813c2e3bc206ea77dea7fc972018554b09 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMake build: Fix devel package issuesEike Ziller2020-04-231-0/+1
| | | | | | | | | Include paths and headers were missing for building a separator Qt Quick Designer plugin. Task-number: QTCREATORBUG-23778 Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Make WidgetTips Squish-testableRobert Loehning2020-04-211-0/+1
| | | | | | Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix workspace list update on cloneHenning Gruendl2020-04-211-0/+1
| | | | | | | | | Adds a missing emit of workspaceListChanged when cloning a workspace in the workspace manager. It will fix a missing update of the workspace ComboBox in the toolbar. Change-Id: Ic2eb3fe516841ba13456c7d94fe699518988ff7a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlJS: Tolerate extra members in qmltypesUlf Hermann2020-04-161-29/+0
| | | | | | | | | | | We are going to add more fields to the qmltypes file format. Qt Creator should not barf on those. Fixes: QTCREATORBUG-23855 Change-Id: Ibea5a8270d2236d6b9b87ae672a1526107fe8b3b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmljs: Do not use app.qmltypes and lib.qmltypes anymoreMaximilian Goldstein2020-03-273-20/+25
| | | | | | | Task-number: QTBUG-82710 Change-Id: I876ec2b8e2b668a239248511b0fbd58389098de6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* fix QPainterPath against Qt 5.15.0Tim Jenssen2020-03-186-1/+6
| | | | | Change-Id: I08aaf6886b04407f1e52ca4f56607c81fccec85c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Android: use QListWidget to show defined NDKsAssam Boudjelthia2020-03-162-0/+3
| | | | | | | | | | Use QListWidget to show all installed NDKs (from SDK manager), and NDKs Added manually by the user. Each item has an icon to indicate if it's removable when added by the user, or non-removable if installed from the SDK manager. Change-Id: I26ae5909ce930d5cc8af561b6b4e9cc5415d12f1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ADS: Fix workspace dialog on removalHenning Gruendl2020-03-132-7/+9
| | | | | | | | | - Fix an issue where the list of workspaces is not correctly updated after removal of a workspace in the dialog - Fix initial sorting of the workspace model Change-Id: I0c16aabc1fdcc2690fcb83e40b0d5d16cb6c72ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ADS: Fix repeatedly dropping in same area crashHenning Gruendl2020-03-137-37/+67
| | | | | | | | | 6c687d28def5c24f3eeb67c9e13d5cfab40cebd0 1c2383f8eb94bc8570e554efa5f842a8ab1461ea Task-number: QDS-1751 Change-Id: I933b1f53da8ce423cd5d38ff2863f58606006596 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix QPainterPath-related compilation errors in Qt 5.15Friedemann Kleint2020-03-123-0/+4
| | | | | | | | | | | | | | | | | Some include of QPainterPath was removed in Qt, causing errors like: easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath' easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath' easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int' to 'const QPainterPath &' easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath' easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath' ... Add the missing include statements. Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QML/JS: Fix punctuation of error messageLeena Miettinen2020-03-111-1/+1
| | | | | | Task-number: QTCREATORBUG-23683 Change-Id: Idb503e00b4f48dfe9ac20d5cc49f6df01153dd20 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ADS: Fix Preset sync failure if directory missingHenning Gruendl2020-03-091-2/+11
| | | | | Change-Id: I23ed2a12753058b36a708c9aff64291782b73809 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ADS: Integrate newest base repository commitsHenning Gruendl2020-03-092-7/+17
| | | | | | | | | | | | | | f3c5d5138024acfb0991fa1794da70a19240c820 fe10b570d3c17eaaf7c4c67e4cf7d56550e6e9e4 4cb1931acec0ce21e0ebc38742b3d4f1c066e368 59c783831ad23238e41205a5da854a9eb39ce777 - Fix reception of escape key press events - Fix display of container dock overlay - Fix comments Change-Id: I34387046335b3d57434decd5714da7ae307bcc05 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ADS: Fix QHash unite warning for 5.15Henning Gruendl2020-03-091-0/+7
| | | | | Change-Id: I384f810bd15ec0c0b191dcdd0654f089de9e8ecb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ADS: Hide detached window if not in design modeHenning Gruendl2020-03-092-0/+17
| | | | | | Task-number: QDS-1672 Change-Id: Ia20113cb9025c19194d87920cf060d2b9791e52a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJS: remove unused QtQuick2 checkTim Jenssen2020-03-062-8/+2
| | | | | Change-Id: I7d613ba825a5ce3d4d8302adff9c98f751bc7ab1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* ADS: Cleanup workspace manager workflowHenning Gruendl2020-03-058-140/+286
| | | | | | | | | | | | | - Add workspace presets - Add reset button to workspace manager - Fix last workspace settings save/restore - Move functionality from DesignModeWidget to DockManager - Remove factory default workspace - Cleanup a few if statements Task-number: QDS-1699 Change-Id: I282dd6162a5a36041f8cd2aacd7407750d54cc22 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlJS: Fix up compile fixChristian Stenger2020-03-042-3/+4
| | | | | | | Amends 33b091bd40187449a3e925659ae0738786e09de3. Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlJS: Fix compileChristian Stenger2020-03-043-5/+9
| | | | | | | | ..in general, with tests, and when using a namespaced Qt. Amends b09a48599e7. Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QmlJS: Fix compiler warning and add a missing includeOrgad Shaneh2020-03-031-0/+1
| | | | | | | | | | qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’: qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type] 72 | } | ^ Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* QmlJS: Fix Qbs/CMake buildOrgad Shaneh2020-03-032-2/+2
| | | | | Change-Id: I27b4e2024ad1cddafea7ca7be5eb3055d34bf297 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* ADS: Properly initialize FloatingWidgetTitleBarTobias Hunger2020-03-031-1/+1
| | | | | Change-Id: Ibc430d45b833fbd5d99cdccaf43dfe06cccb17a4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from FloatingWidgetTitleBarTobias Hunger2020-03-032-2/+3
| | | | | | | We do not use struct in Qt Creator. Change-Id: I1fda8f68520e77b46209890f1355facc723f351e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Initialize all members of DockAreaTitleBarTobias Hunger2020-03-031-4/+3
| | | | | Change-Id: I1e5002f42d105b7cc17f1ebcc01ba38f65d489d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from DockAreaTitleBarTobias Hunger2020-03-034-8/+8
| | | | | | | We do not use struct in Qt Creator. Change-Id: Ieb5f9f4514a8220fa1d2a616baf2c8ef69d4a2c3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Properly initialize DockWidgetTabTobias Hunger2020-03-031-3/+2
| | | | | Change-Id: Iea920eb8fa958d1590c2d7ec8e2b7d7a1ae69837 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from DockWidgetTabTobias Hunger2020-03-035-10/+10
| | | | | | | We do not use struct in Qt Creator. Change-Id: I299effff6a7e6b79494be9a9e2dece1d6492714a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Properly initialize DropAreaTabBarTobias Hunger2020-03-031-3/+3
| | | | | Change-Id: I1f1163cb8c2b005844fc8d689cfa616595e7a672 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from DockAreaTabBarTobias Hunger2020-03-032-5/+5
| | | | | | | We do not use struct in Qt Creator. Change-Id: Id9abb6f3a5a4f4406fbefa24735e5f7e1215eeb4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Properly initialize DockManagerTobias Hunger2020-03-031-3/+3
| | | | | Change-Id: I2728c6d7dd6db736be14efc71a5ab62efc40d6ee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from DockManagerTobias Hunger2020-03-036-11/+11
| | | | | | | We do not use struct in Qt Creator. Change-Id: I7755d66bc7b77825ab17ed333b23cbe36e52ff72 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Properly initialize DockOverlayTobias Hunger2020-03-031-3/+3
| | | | | Change-Id: I3aa43624617858858cd6b27ead506c299d0c0a47 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Remove struct from DockOverlayTobias Hunger2020-03-032-7/+9
| | | | | | | We do not use struct on Qt Creator. Change-Id: I61597081ecdcbc8fcfdc3c0317f83976b268cb7d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Add initialization and remove dead code from FloatingDragPreviewTobias Hunger2020-03-031-3/+2
| | | | | Change-Id: Ia9116581728de5dad8ef263597bc6bc30216e14f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 06:12:58 +0000