summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | TextEditor: Unify error/warning icon and textmark colorsAlessandro Portale2016-10-185-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | In most themes, the color of the warning and error icons differ from the color of the corresponding textmarks (on the scroll bars). This patch makes sure that they are the same. Also the progress bar error color is now the same. Change-Id: Ibce536bed1a9f43d242c2eddf9f94cc6277b2f64 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Cdb: Setup symbol paths before attaching to a processDavid Schulz2016-10-181-11/+9
| | | | | | | | | | Change-Id: I075661ac95da3937dae8c918b83fcc4449d9b56e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Using ':' consistently in the settingsThomas Hartmann2016-10-181-5/+5
| | | | | | | | | | Change-Id: I320ee192b1b76e88d97eab293634640aa194cc3b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | 3rdparty: Update Source Code Pro fontAlessandro Portale2016-10-183-0/+0
| | | | | | | | | | | | | | Roman fonts version 2.030 and Italic fonts version 1.050 Change-Id: Ib5142f373531b3ad20f7b497b708b8f458275a7b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: Unify tooltipThomas Hartmann2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | We had slightly different tooltips for the same functionality. I use the tooltip from the navigator. Change-Id: I0afa53d75c01f23ebbfa1311d69e2f5a895c9e34 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/4.1' into 4.2Eike Ziller2016-10-183-1134/+2188
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/ios/iostoolhandler.cpp Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
| * Fix qbs buildChristian Kandeler2016-10-181-1/+0
| | | | | | | | | | Change-Id: Ia3f0d8b65d0ac1d081934540e4fb04f5b5216b6f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * iOS: Fix build with namespaced QtChristian Kandeler2016-10-181-0/+2
| | | | | | | | | | Change-Id: I09f07ed853e0c9fba8b856d1851b5994f4318945 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Update Russian translationSergey Belyashov2016-10-171-1133/+2186
| | | | | | | | | | | | Change-Id: I898b6166959db375273376e484aeb9956550142d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * iOS: Replaced deprecated signal QProcess::error. Fixes compilation issues ↵Vikas Pachdha2016-10-171-4/+2
| | | | | | | | | | | | | | with GCC Change-Id: I4945b345032023c3c2e8d1fa7f51dadbbb0bc9d9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | iOS: Fix invalid static_castChristian Stenger2016-10-181-2/+2
| | | | | | | | | | Change-Id: I44184a8054ff0a80b9f65c3ccc227b4a6453ba8b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ProjectExplorer: Revive project importerhjk2016-10-174-70/+69
| | | | | | | | | | | | | | | | | | | | Fixes a regression introduced in recent changes. Import project from build is now available again on the target setup page (shown when no kit is active) and in the context menu of the left pane. Task-number: QTCREATORBUG-17046 Change-Id: I5a1285624084f0cb6e0947560516ae88d4b3e376 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ScxmlEditor: toolbar variants of undo/redo/cut/copy/paste iconsAlessandro Portale2016-10-172-6/+6
| | | | | | | | | | | | | | | | In fact these icons should not be in the toolbar at all. But integrating Cut/Copy/Paste into Qt Creator's ActionManager is too much for 4.2. Change-Id: If9ec2f946dd1c500bb7d537d412a342aec929200 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: fix HighDPI wrong font sizesTim Jenssen2016-10-171-0/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-16266 Change-Id: Ie998556961694d269d3288ea4993cf79499e1fc6 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Mark file modified externally as modified after the promptJarek Kobus2016-10-171-0/+3
| | | | | | | | | | | | | | | | In case when the user has chosen not to reload the file. Task-number: QTCREATORBUG-17048 Change-Id: I4eb78af2dbc655ab5e0f3fa19f506aa2302d7877 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Replace virtual isModified method with a getter/setter/notifierJarek Kobus2016-10-1728-136/+113
| | | | | | | | | | | | | | We have lacked the setter and dedicated notifier before. Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | CppTools: Avoid "defineLine" in CompilerOptionsBuilder APINikolai Kosjar2016-10-172-12/+14
| | | | | | | | | | | | | | ...because it might suggest to append a new line. Change-Id: I8d5701a1d20c9d94ee528383227a6e3b446b4ff2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.1' into 4.2Eike Ziller2016-10-1745-3372/+797
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/ios/iostoolhandler.cpp src/shared/qbs src/tools/3rdparty/iossim/iossim.qbs src/tools/3rdparty/iossim_1_8_2/main.mm Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054
| * iOS: Removed ios_sim tool source. simctl is used for app deployment on iOS ↵Vikas Pachdha2016-10-1728-3145/+0
| | | | | | | | | | | | | | | | Simulator Task-number: QTCREATORBUG-16942 Change-Id: Ie50bdfdbf9005e383a2753a3c6081a563a175f61 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * iOS: Replaces ios_sim tool with simctlVikas Pachdha2016-10-1715-235/+788
| | | | | | | | | | | | Task-number: QTCREATORBUG-16947 Change-Id: Ia28d5e4f9f220d566bd64da73989e8c24ef3eb37 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Doc: Describe profile build configurationLeena Miettinen2016-10-171-3/+5
| | | | | | | | | | | | Change-Id: I1e4ef880423c16346f338fa41ff5b14708aced82 Task-number: QTCREATORBUG-17123 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Update qbs submoduleChristian Kandeler2016-10-141-0/+0
| | | | | | | | | | | | | | To HEAD of 1.6 branch. Change-Id: I36b6804100a41e52a8f1ec20e987ffeed6721245 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * fix build of qmldesigner coretests against namespaced qtOswald Buddenhagen2016-10-141-0/+4
| | | | | | | | | | | | Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | CppTools: Always pass in header paths as native pathsNikolai Kosjar2016-10-174-9/+5
| | | | | | | | | | Change-Id: I473c737107c14a4bc2c78b7c697eef02eb4bacff Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | CppTools: Exclude compiler option from conversion to native pathNikolai Kosjar2016-10-171-3/+4
| | | | | | | | | | | | | | ...otherwise e.g. MSVC's "/I" option will be converted to "\I". Change-Id: Ia01519ee5c942d0f3cdd32c4302055d0e58fb865 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangStaticAnalyzer: Remove new line character from define valueNikolai Kosjar2016-10-171-1/+1
| | | | | | | | | | Change-Id: I3949ba372c490d39b4277825f5194a8d36ee26d2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Add an "Active Project" label to Project windowhjk2016-10-171-0/+8
| | | | | | | | | | | | | | Change-Id: I9036d25f9cde0849c8a2fed5b2c3ce97f1315f55 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | QmlDesigner.PropertyEditor: Fixing font issuesThomas Hartmann2016-10-172-3/+3
| | | | | | | | | | | | | | | | fully qualify properties to avoid ambiguities Task-number: QTCREATORBUG-16403 Change-Id: I0f0f7a7dbf28f51aa82bf3e2fd2652189c460102 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner.PropertyEditor: Fix color logic for LineEditThomas Hartmann2016-10-171-1/+1
| | | | | | | | | | | | | | Explicit changes should be highlighted in blue. Change-Id: I221016e5cd70643ae68faf7ebd0d6e0b1616a41c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Adding ExtendedFunction button to UrlChooserThomas Hartmann2016-10-172-11/+16
| | | | | | | | | | | | | | | | | | | | | | This allows to edit/set bindings on urls for e.g. images. Instead of the hack before we now use padding in the style to reserve space for button. Task-number: QTCREATORBUG-13328 Change-Id: I94bad70618440a2ed835629e561a394d76990883 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix compilation with Qt 5.6Orgad Shaneh2016-10-171-1/+2
| | | | | | | | | | | | | | | | Broke by 5da074f95a0a8fcc548a5b0bad4fe50a5fa11e5a. Change-Id: Icd0400e7b19a564ba2777e1cceadd4994eb867f8 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: Fix ESC issuesThomas Hartmann2016-10-143-0/+8
| | | | | | | | | | | | | | | | | | | | We do not want to switch to the editor whenever pressing ESCAPE. Using shortcut override does not work for QQuickWidget. Therefore we register our own action and disable it. Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.1' into 4.2Eike Ziller2016-10-143-56/+112
|\ \ | |/ | | | | Change-Id: Ib5b66f97374a4e330aa6fa9e604378da29290d65
| * Extend source creation script for other plugins/componentsEike Ziller2016-10-132-55/+111
| | | | | | | | | | | | | | And implement that in Python Change-Id: I08d555927efffb0f8a4bafb54064ac2e5e06d730 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Changelog: Fix spellingLorenz Haas2016-10-121-1/+1
| | | | | | | | | | Change-Id: Ibfd7bfc02e5f5c7b24b41f070917d4c67fb8a175 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ProjectExplorer: Filter out unusable kitshjk2016-10-143-10/+29
| | | | | | | | | | | | | | | | | | As side-effect, fix missing expansion of subitems in some cases. Task-number: QTCREATORBUG-17110 Change-Id: Ib0c74e968d6d814f9dadbb37b323c8ac68cda310 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Clang: Fix uninitialized memberNikolai Kosjar2016-10-142-3/+2
| | | | | | | | | | Change-Id: I31cbce287f1f8d2b0c55be23fde4288ec3472639 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Update README.mdFriedemann Kleint2016-10-141-2/+28
| | | | | | | | | | | | | | Add information on how build LLVM on Windows. Change-Id: If67c07a82554ec88edf798951212c036966710ba Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | AutoTest: Polish framework settingspagesChristian Stenger2016-10-142-114/+55
| | | | | | | | | | Change-Id: If39e157c499b7ee9454d61de39ce2b360a109a94 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CppEditor: Clean up header error indicatorNikolai Kosjar2016-10-149-49/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | * Show/hide the error indicator button instead of enabling/disabling it. * Use "Minimize" instead of "Do Not Show Again" in the info bar button and use a custom setting to save this. The current info bar API does not signal addition/removal of global suppression ids which would be needed to update all editor widgets properly. We are the only client and it feels wrong to add this API there at the moment. * Remove not needed code anymore. Change-Id: I2bb872522b7410434f060cc359a3b62dfed0af4d Reviewed-by: David Schulz <david.schulz@qt.io>
* | Cdb: Optimize dump of std containerDavid Schulz2016-10-143-23/+32
| | | | | | | | | | | | | | | | Cache container member offsets. Task-number: QTCREATORBUG-16710 Change-Id: I47c471eae355e1f1220fe22ad1cdd0cb67d430a1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Use a static const QSet for keyword listOrgad Shaneh2016-10-131-30/+34
| | | | | | | | | | | | | | | | | | Makes the lookup faster. Also sort the keywords. Change-Id: I25ce0f2d1de7be572fecccc09b5ec12d81152e95 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Do not allow JavaScript keywords as idsThomas Hartmann2016-10-132-4/+30
| | | | | | | | | | Change-Id: Ifbbc7c36778dcc4e63df8c34929cd7f872875087 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Ensure lineedit has the correct colorThomas Hartmann2016-10-131-1/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-12513 Change-Id: I5a169561cb378bbe952c5544ec86510a9b7349f3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Add more items to component comboboxThomas Hartmann2016-10-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes sense to also add items that are not in a default properties to the component comobox. These are items like styling delegates: Slider { handle: Item { } } or the items of e.g. a Flipable: Flipable { front: Item { } Those items are not shown in the navigator (TODO) and it makes sense to edit them if they were an inline component. Change-Id: Iab5b6e0238625b5a486901fbf617911d06a34581 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Changing order of imports in UIThomas Hartmann2016-10-131-2/+2
| | | | | | | | | | | | | | | | File imports should be first, because they relate to the project and there are most likely just a view. Change-Id: If7bfc648c694bcc3f010d99b125d7349061bb6db Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Allow adding of file importsThomas Hartmann2016-10-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | All the functionality to support file imports in the import manager is already there. We just have to add the file imports as possible imports. We only include direct sub directories that contain at least one qml file, but no qmldir file. Task-number: QTCREATORBUG-12126 Task-number: QTCREATORBUG-11518 Change-Id: I1b606ae11682886f430794f451177980b9c5f9aa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Utils: HighDPI-able, themable filenew and open iconsAlessandro Portale2016-10-137-4/+54
| | | | | | | | | | Change-Id: I1b9dc3393c6ec7965fbca42a561303ddc01201eb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: Make sure that the export alias icon is not scaledAlessandro Portale2016-10-131-2/+2
| | | | | | | | | | | | | | SecondColumnLayout would otherwise scale it up, at least on HightDPI. Change-Id: I5c1bd6357e8559deee26002b90128abfbacf449f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Dumper: Fix padding handling (32bit)Christian Stenger2016-10-132-7/+7
| | | | | | | | | | | | | | This also reverts 3d68a8d0dec033eebef7d0ead082a291afa9454d. Change-Id: I3e527096b4d36a102f010e538e428654cc3b783c Reviewed-by: hjk <hjk@qt.io>
View Lorry Controller Status