Commit Graph

44349 Commits

Author SHA1 Message Date
Thomas Hartmann
c168ba9f11 QmlDesigner: Fix indenting in embedded text editor
We have to set the duplicated editor as the current editor.
We avoid triggering a document change by using a flag.

Change-Id: I22410ec2f3b24695b397525811940c8303e0ed87
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-01 11:20:27 +00:00
Tobias Hunger
cd01c82827 ToolChain: Polish
Change-Id: I97f58a216da6b03b6b45c1e226b1eeafcdae7854
Reviewed-by: hjk <hjk@qt.io>
2017-03-01 11:16:57 +00:00
Thomas Hartmann
20b082b327 QmlDesigner: Crash fix
We have to use deleteLater.
If a file change is triggered by the text editor (F2 follow symbol),
the new text editor is set, while some text editor code
is still keeping a pointer to the original text editor.

Change-Id: I25e271f3800b763d644d9f2c5dd2b80b74ecf990
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-01 11:16:44 +00:00
hjk
c887de8c1a QmlProjectManager: De-pimpl QmlProjectItem
And remove dead code.

Change-Id: Ia7bd16c028e7275afb2bf88940eac3894411967a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-01 10:49:18 +00:00
Montel Laurent
ac3710735b Beautifier: Allow to define specific config file
Change-Id: Ic6410d7eae27a008cbb46f506ca5907f80d6ea68
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-01 10:10:40 +00:00
David Schulz
edacb7d383 Debugger: Use symbol tag to determine type code
Change-Id: I49a2a0f3e1ff65accb0d2e04fbd9352ce3f63f2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-01 10:07:43 +00:00
David Schulz
de1cd79546 Core: Add option to disable automatic build of the wininterrupt tool
Change-Id: Ia979c586523f6509056dfcec0eec2d632fc39b1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-01 10:05:50 +00:00
Lorenz Haas
2ce4bbc458 Beautifier: Fix formatting with AStyle and make it more robust
Only version 2.04 added an extra newline. Later versions are fixed, so
the should not remove a newline.
In addition if piping is enabled we stream "\n" line endings so tell
AStyle this explicitly by passing -z2. This disables the automatic
detection which can be faulty with short code fragments.

Task-number: QTCREATORBUG-17546
Change-Id: Ib90526234bfbc4d3530fd9c3a15bdfb3af02bebd
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-01 08:53:44 +00:00
David Schulz
90e6eb1b56 Debugger: Extract create value functionality
Change-Id: Ia02fa053ec2a70fcd47e8f4efdd5ea8dae735200
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-01 08:42:09 +00:00
David Schulz
c517714822 Debugger: Expose current symbol group to other python classes
Change-Id: I8648d0269bdc2a4085ecf550171bb33d66f2fb30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-01 08:42:01 +00:00
hjk
4e1922ce5f Debugger: Remove some unneeded "No process" notification in CDB
Change-Id: I84d4aa30ff52f9a368503edc41f4a51e709a3a6e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-01 08:37:03 +00:00
hjk
32ae4d3e09 Debugger: Use Utils::ProcessHandle for DebuggerEngine::m_inferiorPid
That's the intended "typesafe" use.

Change-Id: Ib288fe87a47bd9484bda83e05406f0d22989b3c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-01 07:56:18 +00:00
Thomas Hartmann
96f615b477 QmlDesigner: Fix warning
Change-Id: Ifbf626a484c0acb65d3d980c81e8d2ab535cab19
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-01 07:38:08 +00:00
hjk
30fde73736 ProjectExplorer: Remove some unneeded declarations
Change-Id: Ie5bab9205692748f7913c58b5478b2e6d072df4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-01 07:02:50 +00:00
hjk
8fd17a84b5 ProjectManagers: Cleanup
Remove unused class members, declarations, includes, unneeded
::projectManager overloads etc.

Change-Id: I0f4ae87414faca226554722e2a9147cb5512495d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 16:15:03 +00:00
hjk
6fc03ac621 QMake: Simplify QmakeProject::creationIds use further
We always operate on specific types of proFiles, knowing the types
suffices as interface.

Change-Id: I5ffe8862ae31234843a71bdae537825b37ccd311
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 16:14:50 +00:00
Thomas Hartmann
b7e2f672cf QmlDesigner: Improve performance of nodeAtTextCursorPosition
We find candidates by a linear search using just the offset.
This way we have to calculate the length (which is slow) only for
a very few selected nodes.
The number of nodes we have to calulate the length for is bounded by
the maximum nesting, which is for any sane QML file smaller then 10.
Before we had to calculate the length for every node.

Change-Id: I53a03818e9986db4a224aef876b333444aa1c15b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-28 16:14:43 +00:00
hjk
50d1690854 ProjectManager: Centralize "File not found handling"
That's the only error that was ever checked for, in all nine
project manager. In the hypothetical case that we'll need something
else than the name of a file to identify a "project file", we'd
probably need to touch the signature anyway. Until then, remove
the duplication.

Change-Id: Iba00b8f71309a908e2d29c0a58c50b685eca0cae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 16:14:35 +00:00
hjk
3490c5751d QmlDesigner: reduce include in cpp
Change-Id: Ibdccbfc11834bbdefba15070d8f1c3c470b9a8ea
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-28 16:14:20 +00:00
BogDan Vatra
c6440c3a21 Add the needed infrastucture to enable application output filters
Currently will be used only by Android, but in the future can be
extended everywhere

Change-Id: I37314248f2d6dba2401e853b2a6ea4a36859f502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 15:16:36 +00:00
hjk
865a1ea259 QtSupport: Simplify example reading code
The default empty QVariant converts well enough to empty strings etc
to not have to check for its presence explicitly.

Change-Id: I8d3b20b3e463d8b504e27e86dc44c1b5de6de63a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-28 15:06:33 +00:00
hjk
4d3d2d0dfb ProjectExplorer: Remove Project manager parameter from some constructors
Can be done generically when creating projects. The only wart is
the use from BaseQmakeProjectWizardDialog::writeUserFile.

Change-Id: Ie98c9f88ec142e82443e204a0075e3ae9e163752
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 14:56:21 +00:00
Tim Jenssen
7194e968a8 QtcProcess: fix cancel builds at windows
kill terminate and interrupt are reimplemented for QtcProcess
to send the commands to all children, we need to call them in
case QtcProcess

Change-Id: I6bc9b240c30634bfb7f81e54f293f5ef6b5c1792
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 14:48:10 +00:00
hjk
6c8c624450 QmlProject: Minor code cleanup
Whitespace, namespace, inline trivial functions, ....

Change-Id: Idf7d8c120b54367c8ea98171c21506e2b3f5346b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-28 14:43:29 +00:00
Christian Stenger
0912df9998 QmlDesigner: Fix build
Change-Id: I115d67c2ec1f1d9ef23eca57768eafa4f7656bb3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-28 14:30:11 +00:00
Tobias Hunger
68b1859f58 qbs: Simplify add/remove file code
There is no need to call setupFiles on the QbsGroupNode before calling
update() on the root node. That will just redo the work anyway.

Change-Id: I54048395f87dd6fb5436f5d9d47b97e82460b568
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-28 14:24:59 +00:00
Tobias Hunger
563b5033f8 Qmake: Fix build/run qmake from context menu again
This got broken when refactoring the project nodes.

Change-Id: Iae4614f4a367cefeba3f70faaf19bc2f8994fb0f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-28 14:24:42 +00:00
Tobias Hunger
cd1fd0fba9 Locator: Fix warning in directory filter
Fix a warning about member variables being initialized in the wrong
order.

Change-Id: I55f5b2725fc9ac859249649dc21fbcc8fef4b0f3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-28 14:16:29 +00:00
Thomas Hartmann
16acea3a25 QmlDesigner: Implementing the resource images view as ListView with flow
This design allows different image preview sizes and
is a lot more usable.

Change-Id: I0be4270a16e28d549296e0659b76cd7eecab1f57
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-28 14:08:16 +00:00
hjk
d49067f33c QmlProject: Clean tree before re-population
Regression after 9e8b427a70

Change-Id: I34c96e1e8f14c6fc76e744f9847060a3094bb005
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-28 14:06:31 +00:00
Robert Loehning
e6fd203b76 QmlProfiler: Initialize members inside class
Change-Id: I8154dad0eef9e11650e257b46840c295cf5e0624
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-28 12:57:20 +00:00
hjk
b45c709dff QMake: Centralize determination of available creationIds
No need for each target to do essentially the same.

Change-Id: I76b6a0f2d064d7721f4ebe676f6efe12d3b5f87c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-02-28 12:19:11 +00:00
Orgad Shaneh
ffbdfb883a Gerrit: Improve curl detection
Until Git for Windows 2.12.0, curl was shipped twice - a MinGW version
in mingw{32,64}/bin, and MSYS2 version in usr/bin[1].

On 2.12.0, the MSYS2 version was removed, leaving only MinGW.

The plugin only searches for curl in usr/bin, so it is clearly broken
with 2.12.

There is no reason to add mingw*/bin to GitClient::gitBinDirectory()
(and return a list), because there are no other useful tools there. The
other tools that use gitBinDirectory are patch and ssh, which are both
in usr/bin.

[1] https://github.com/git-for-windows/git/issues/1069

Change-Id: I5eb5fa727fa384835792c59fd018fdfa31594927
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 12:09:45 +00:00
hjk
4e7e5da8eb QtSupport: Don't wait for Help initialization if plugin is disabled
Change-Id: I068d25143399c09393be20b7aa32fe7c6dcb2fe9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-28 11:59:58 +00:00
hjk
1328b04e7b qmake: Simplify QmakeProFileNode::buildDir()
The optional BuildConfiguration parameter is never used.

Change-Id: Ic5773616920702134848507ef2801a7723e8b65c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 11:59:46 +00:00
hjk
8b5b1f1de7 CMake: Move CMakeProjectManager::findCbpFile to tealeafreader.cpp
That's the the only user of that code.

Change-Id: Iabc6a1fa9a4ad05c467e8ed64386d3185de25f02
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 11:59:07 +00:00
hjk
28b6c4f671 ResourceNode: Add some tests for actual node types
Change-Id: I20297df727adf2058583b64975e7a6848bc80263
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-28 11:32:32 +00:00
Christian Stenger
a2b47b7da2 ClangCodeModel: Fix compile
Change-Id: I648ebd8d898cab3bb121eabf96f2de3d4b28842c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-28 11:30:37 +00:00
Eike Ziller
a144160c44 Provide exclusion filters for custom locator filters
Change-Id: Ibd853b456d431ed6fd72d0617b1785b8f305e6c1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-28 10:48:37 +00:00
Eike Ziller
1f8b2dc361 Advanced search: Add exclusion patterns
All files with full file path matching one of the exclusion patterns are
ignored in the search.
Searching with "git grep" now requires git >= 1.9

Change-Id: Ied5d11499bc1ff21247e50f8e146e8e5011dd2c1
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-28 10:48:23 +00:00
hjk
99a6d78bba Debugger: Use (only) -thread-group-started as pid notification
The notification exists since GDB 7.4, i.e. no further restriction beyond
our current 7.4.1 minimum requirement, so there's no need to read pids
from tea leaves.

Change-Id: Ibfe14a46059fc1c917ada6ac445b364c958d0b3f
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-28 10:19:11 +00:00
hjk
9fd88bbbc3 QtSupport: Add worldsummit16.png to .qrc
Forgotten in 48955493.

Change-Id: I198f8e095d65f835cc2aff822d56ea2a508756ad
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-02-28 09:56:57 +00:00
Nikolai Kosjar
d3b51ccda7 Clang: Avoid pointless preamble regeneration on Windows
...on first user modification of the document by ensuring that libclang
sees only one kind of line separators.

This reduces the latency for the very first completion.

Change-Id: I9fdd5641e673a5d07200d61476d56d01db62b89e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-28 09:56:16 +00:00
hjk
7c5f2184c6 Welcome: Move worldsummit16.png to plugins/qtsupport
Alongside the other icons nowadays.

Change-Id: I58bfc605fab1032a2d94a31a46f394bde8c0348e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-02-28 09:37:43 +00:00
Nikolai Kosjar
d1133916a9 Clang: Fix release build
* The QtTest include is not available in release builds.
* Make the batch file mode only available in debug/test builds as that
  one uses test utilities that are only available in debug builds.

Change-Id: I441c51ec00b14b81a396ad0199882cf46fff10b0
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-28 09:34:55 +00:00
hjk
7c29ae462b Debugger: Fix crash in combined debugging
Fixes regression introduced in f8ad72deb3: Slave engines don't
have a RunControl pointer of their own, use the master pointer.

Change-Id: I1c695a1454cafc3532fb1b79374fac4f3ead607e
Reviewed-by: hjk <hjk@qt.io>
2017-02-28 08:00:05 +00:00
Thiago Macieira
bfb1a084dc Add the JSON syntax highlighting file
Like XML (which is already present), it's very useful.

Source: https://cgit.kde.org/syntax-highlighting.git/plain/data/syntax/json.xml

Change-Id: Idd5ceba1eba34cb78c46fffd14a738f347db0d19
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-28 06:35:07 +00:00
Tobias Hunger
ada3f4ba95 ProjectExplorer: Retrieve output from Journald more reliably
Retrieve output from Journald more reliably.

Change-Id: Ic733698e7ed3717841a5a902c4f1e9e94d952885
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-27 16:32:44 +00:00
hjk
18fe7b3c7e CMake: Remove unused function CMakeManager::createXmlFile
Change-Id: I084b5dd4f07d709fdf5a1fd65884df8c741bbb86
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-27 15:24:28 +00:00
Montel Laurent
1da4966b26 CPaster: Replace 0 by nullptr
Change-Id: Ic916a6b464951ea319345333c0c7188852f58d8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-27 14:35:06 +00:00