Commit Graph

44349 Commits

Author SHA1 Message Date
Thomas Hartmann
f2db3a91a6 QmlDesigner: Disable validator for connection source
Change-Id: If51f2336364b9e2a44ad7f4657b9b6245a66143b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-25 14:06:03 +00:00
Thomas Hartmann
148e5a2792 QmlDesigner: Adding warning
Change-Id: I72fded3037ce912a5d01531c86da5a35c1996e3a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-25 14:05:25 +00:00
Tobias Hunger
4b624ba7e9 Vcs: Optionally pass binary to run
Change-Id: I33eb1ce7d874bea27979068aca310f607ec7fde8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-25 13:39:38 +00:00
Tobias Hunger
e0ee142f8d Nim: Collect project data asynchronously
... and provide a progress bar.

Change-Id: I9d57c0dd1d26325eb9e6f15c8fada9e1fc398d9f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-25 13:39:25 +00:00
Giuseppe D'Angelo
e9aaf017c2 Project wizards: warn when using deprecated APIs in new projects
As discussed at QtCS, almost none of our users know that they can
get warnings when they use deprecated APIs, and/or disable them
altogether. A first step would be getting the relevant defines added
by the new project wizards.

Change-Id: I5d4260b5aa094ac2a077b7b00eaa577108e5f612
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 12:00:16 +00:00
Tobias Hunger
e86383c741 ProjectExplorer: Add a way to scan a directory for filenodes
This is useful for several project types, so do this properly in
ProjectExplorer.

Change-Id: Ic659ff6824daffaeb441e11f5072d496194d48fe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-25 09:17:08 +00:00
Oswald Buddenhagen
ed7d13b6fc remove dead variable from QmakeProject::updateCppCodeModel()
allFiles was never read.

Change-Id: I96aa00ec43db342a572a41f1662ad3d76979f3b4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:11:59 +00:00
Oswald Buddenhagen
b8ea6e8f0e remove redundancy from QmakePriFileNode::recursiveEnumerate()
we *know* that this function is called only with folders; it's part of
its api.

Change-Id: Idada1e6672a916c0d550d191770396ebbc54b02f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:11:51 +00:00
Oswald Buddenhagen
bd3f39a358 accept absolute paths in qrc file elements
while untypical, it's perfectly legitimate to have absolute paths in qrc
files. auto-generated files (like the ones created by resources.prf when
shadow-building) can make good use of them.

Change-Id: I59da260b5241096f7c44b9de5ee04f65e8c1218c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:11:36 +00:00
Oswald Buddenhagen
7754606bea don't collect dynamic variable names from cumulative reader
we actually use variable values only from the exact reader, based on the
idea that the cumulative parse is too dangerous, as using recursive
watches on inexact data may be a bit heavy. using additional variable
names from the cumulative reader sort of defeats the idea.

Change-Id: I8bf3e298bf89593dcc77548cc3d2cbf7881202dd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:04:34 +00:00
Oswald Buddenhagen
65c32320df don't process SOURCES twice
moc.prf also adds an extra compiler which takes SOURCES as input. as we
add it to the list manually, we have to filter it just like HEADERS.

Change-Id: I81b8b68965c1b65fd0cef6a68c01ad00d51d6dee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:04:04 +00:00
Oswald Buddenhagen
5e148f1147 actually show errors from bogus SUBDIRS entries
this got lost in 51ba32bcc.

Change-Id: Ic0c982cff8d4030eae8e942f9324fd6f49c68aa9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:03:50 +00:00
Oswald Buddenhagen
c0ddf0a344 make message about not found mkspec less confusing
Change-Id: I9cfa2c9476d3d7fdb68b0a23e175eea4b3b11ad9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 09:03:45 +00:00
Oswald Buddenhagen
f9097b7efd add discard_from() function
this function discards all values that come from a specific file. it
will be needed for configure bootstrapping, but is too obscure to
document it for general use.

Change-Id: I62c18aeb1847712e33d0599dbb0b90ffa1722438
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/12bb328bb0be8efe54aae750c21938aab4d17539)
2016-10-25 09:03:38 +00:00
Oswald Buddenhagen
69a4f6c2b5 add support for returning the command's exit status to $$system()
... and make use of it in qtRunLoggedCommand().

Change-Id: I242dfde344f555800cef1f55d3cb85418a93277f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/0eff800e81f3e7f803dffd77737faaed73002ac8)
2016-10-25 09:03:22 +00:00
Oswald Buddenhagen
9596d6790b print no message at all when no argument is supplied to error()
this is useful when an adequate message has already been emitted by
other means, like various built-ins do.

Change-Id: I092771f55969fad8b214204d666327664727c572
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/22d1351ddea193f5c00d4ae12229358dea826c62)
2016-10-25 09:03:12 +00:00
Orgad Shaneh
a423f52310 QbsPM: Move QbsBuildStepConfigWidget to cpp file
Change-Id: I9ad8598ca0fae7d5c48f7debb30a364c88456a46
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-25 08:48:44 +00:00
Orgad Shaneh
fd6b3cd484 Git: Enable "First Parent" display in log editor
Shows merge commits instead of recursing into them.

When Diff is enabled, it will be done against the merge commit's parent,
rather than showing conflict resolution.

Change-Id: Iaa3ac622ffde34e58763a968d387041e0ef99b21
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-25 08:47:52 +00:00
Nikolai Kosjar
e373061119 Clang: Explicitly add extra space in diagnostic widget
...otherwise the one that is there will be ignored for long diagnostic
messages.

Change-Id: If9327f40b2af3315941cdb7cdf40d9e44854408b
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-25 08:31:56 +00:00
Tobias Hunger
2a3cb8d7cb Qmake: Add variable chooser to build directory path chooser
Task-number: QTCREATORBUG-17160
Change-Id: I11974b04f1ab7f757fddb7a62bff787a977838ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-25 08:10:04 +00:00
Tim Jenssen
e83dd17554 QmlDesigner: reduce max puppet start wait time
Change-Id: I6b68d58ea870a17f9639a9dd174baa9b12ca082e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 20:37:26 +00:00
Alessandro Portale
ff2c49538b ScxmlEditor: Improved "Export Canvas" icon
Change-Id: Ibca3ec6fbe593644bdae223bad469dea2aede41b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 16:27:37 +00:00
Orgad Shaneh
c844071627 Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfig
Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-10-24 16:23:59 +00:00
Jarek Kobus
2c6adc1e74 VCS: Replace QToolButtons in VCS toolbar with QActions
Change VcsBaseEditorParameterWidget to add actions/widgets to an
existing toolbar, instead of being a widget itself.

The class is renamed in a follow-up commit.

Task-number: QTCREATORBUG-14934
Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-10-24 16:23:33 +00:00
Orgad Shaneh
631211f7e2 Utils: Fix Guard documentation
Change-Id: I18a23c4410424f3799b9ec5bcacccac742713c63
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-24 16:23:15 +00:00
Alessandro Portale
d6c8a97429 ImageViewer, ScxmlEditor: Use the new "Zoom In"/"Zoom Out" icons
Change-Id: Ib01060918924644b57d35083a4269614fba900c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 15:29:28 +00:00
Alessandro Portale
ee8cb08e2c Utils: "Zoom in" and "Zoom out" icons
Change-Id: I596cde174d63e23cf29c4d528c6b3b9b70e17aaa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 15:29:19 +00:00
Tobias Hunger
6cd68d5401 Nim: Do not crash on empty nimprojects
Create a Nim Application using the wizard, remove main.nim, open.
Without this patch creator crashes.

Change-Id: Ia1628c67525e2fe9bb8dd9c76f62d7074844ccc4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-24 13:47:45 +00:00
Tim Jenssen
dafdf290d0 QmlDesigner: prepare centerWidget to use styled QTabWidget
Change-Id: Ibcc6e7d5866df50448b54ecc4f2aff340b353f77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 12:47:22 +00:00
Tim Jenssen
12ad723349 QmlDesigner: reorder css lines
No behavior change

Change-Id: Ib05d9a369d5cba0132636efdccfea873890027b5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 12:47:06 +00:00
Alessandro Portale
f45293dae6 BareMetal: Themable, HighDPI-able device icon
Change-Id: Id8d9c0885895f582dbb034546b701ec82f1492e6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 12:04:26 +00:00
Tim Jenssen
6cd31a2b98 QmlDesigner: deactivate use of F4 to switch in design mode
Introduce a setting for a not implemented in design text edit.

Change-Id: Ie4973ec4fcb2c9b2e2534e40187cf33a0202abaa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 11:53:57 +00:00
Tim Jenssen
711f54bd8f QmlDesigner: move static methods
Change-Id: I3f1998ddbddadd9ffc782d1ca87884564d6ad83c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 11:53:51 +00:00
Tim Jenssen
9f353b56b6 QmlDesigner: use noquote, to respect line separators
Change-Id: I98241fe605b9fb9925e9ab70bffc1ae6608cea3b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-24 11:53:44 +00:00
Christian Stenger
05fa0cc0db AutoTest: Let results pane only pop up on finish
It is quite annoying if one minimizes results pane while a long
test is running and for each result item the pane comes up again.

Change-Id: I7020ae698cd61df01ed5b1402cc06d26fb018978
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-24 11:47:29 +00:00
Eike Ziller
7480f58cf1 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421
2016-10-24 13:17:28 +02:00
Orgad Shaneh
4ca1fb0e9a VCS: Fix inverse condition
compare returns 0 when the strings are equal

Change-Id: I4dfd3b402d48a3043e9674f1d82e66c968e8ba94
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-24 09:07:46 +00:00
Tim Jenssen
f5b3dcfc83 compile fix
Change-Id: Idb8e01dc2895621cf94ba047a41eef5ca0474089
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-21 16:51:30 +00:00
Tim Jenssen
29c58eabed QmlDesigner: refactor indent feature
* add indentLines() method
* refactor indent to use indentLines()

Change-Id: Ie36c7ab6217c31e9e3913a4dd5da2196364200c8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-21 15:08:53 +00:00
Tim Jenssen
81bdb9cdf9 QmlDesigner: add getLineInDocument() for convenience
Change-Id: I34f788e320fe4c38e3dbb55ba6d0bc1b8d9ba59a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-21 15:08:41 +00:00
Tim Jenssen
9844cd242e QmlDesigner: space only cleanups
Change-Id: I959208b27694ff3c75650a3f482a0a975ca6e769
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-21 15:08:34 +00:00
Tobias Hunger
28325aa446 VCS: Add a way to filter out files/directories that belong to a VCS
Change-Id: I4dcbe6242cfe327e3b72d3dd550309be45e326a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-21 13:04:40 +00:00
Friedemann Kleint
e6b23dc2e5 clangcodemodel: Use forward slashes for CLANG_RESOURCE_DIR define
Adapt qmake and qbs files, fixing warnings on Windows:
clangutils.cpp(78): warning C4129: 'o': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'L': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'l': unrecognized character escape sequence

Change-Id: I7a5fe674665437582457645f2a081e1e38d5df77
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-21 10:29:40 +00:00
Nikolai Kosjar
7473469005 ClangStaticAnalyzer: Tests: Change target only if necessary
...otherwise we wait for nothing.

Change-Id: Ia55d4845f8dd0fe746ee6c8ca19b5312879294d1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-21 10:20:50 +00:00
Michal Steller
768eb4e52e TextEditor: Duplicate selection (Duplicate selection and comment)
New TextEditor action for duplicating current selection.
Extended version of this feature creates commented duplications.

Possible use cases:
1. No selection, cursor anywhere in text - Duplicity line
2. Simple selection - Duplicity selection
3. Block selection, without columns - Duplicity lines
4. Block selection, with columns - Duplicity selection

Cursor position and selection stays unchanged. Works well with Undo
action.

First use case with no selection looks similar as copyLineDown, but
difference is that copyLineDown moves current cursor position and select
created line. This feature don't change cursor position. Because of this
difference it is not possible to integrate this additions with
copyLineDown.

Quick intro: https://youtu.be/Fv6WdCnCLpo

Change-Id: I7c36fca6e17de030cbd22cfa103c2ed672deabbc
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-21 10:00:10 +00:00
Nikolai Kosjar
028018dcac Clang: Clear left-over preambles after crash
...otherwise they accumulate in the temporary directory.

Change-Id: I0841f3d168f30f559fc718d2825dd3e800515074
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-21 09:53:12 +00:00
Jarek Kobus
8224c1c95d DiffEditor: fix revert chunk for diffs of modified files
Apply chunk action doesn't make sense for that case,
will stay disabled.

Task-number: QTCREATORBUG-17136
Change-Id: Idce31b3aa9d354536a01607c10b20273158961d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:49:08 +00:00
Jarek Kobus
344f255fa9 Reuse the Guard class
Change-Id: Ia742ab92fd7947f4d156d03e112ee32363312996
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:48:40 +00:00
Jarek Kobus
d3a743d77e Use namespace Core in diff editor plugin
Change-Id: I2409a6186d590a83ccde064c855e0261d600014e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:20:35 +00:00
Jarek Kobus
4ae306a5e1 Handle "Diff All Modified Files" action enablement
Also rename it to "Diff Open Files".

Task-number: QTCREATORBUG-17094
Change-Id: I370c32497fcb56cb2bd84700ef7cb4aa7ba0a573
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:20:29 +00:00