Commit Graph

44349 Commits

Author SHA1 Message Date
David Schulz
0ecc044478 TextEditor: Add delete(Start/End)OfLine actions
Task-number: QTCREATORBUG-18095
Change-Id: I75e6141687ba5e96ef59384b302357700f79dd55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-26 09:48:43 +00:00
Robert Loehning
1ee59f1879 GccToolChain: Fix detection of 32 bit MinGW on 64 bit system
Change-Id: Ic5f8651c8e0f9fb61c3ba94aa88309af2c585ca4
Done-by: Tobias Hunger
Task-number: QTCREATORBUG-17989
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:21:51 +00:00
Orgad Shaneh
83b7469932 SmallString: Enable alignas(16) on MSVC-64
Change-Id: I2af5a7ff26a80167d7cb95daf1d7fa5963e9097b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:17:13 +00:00
Orgad Shaneh
2129ffc954 Clang: Fix MSVC64 warnings
size_t -> uint conversion

Change-Id: Id86168a9e2b9b7f9793cedccc41a6d15c0a8dfd4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:03:47 +00:00
Orgad Shaneh
e1660a18cf Remove workarounds for unsupported compilers
Change-Id: Ie28ff761b0bae13c6ebdf7dd649cfbba28e0fc2c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-26 08:27:31 +00:00
Eike Ziller
531fba61f0 Merge remote-tracking branch 'origin/4.3'
Change-Id: Ie18d823d0940113e8a78c81204b7a7ca07a060ba
2017-04-26 10:16:38 +02:00
Eike Ziller
73f2c0f4e8 Allow giving TextEditorFactory custom CommentDefinition
It was not possible to set custom comment styles.
Also simplifies the code for the predefined styles.

Change-Id: Id7f345d65b747bfac5a15e3eb15cd2beb106b281
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-26 07:34:29 +00:00
Tobias Hunger
b2fe7c9ad1 CMake: Use canonical source directory when talking to cmake server-mode
Use the canonical form of the source directory when talking to cmake.

Cmake will save the canonical source directory in its settings and will
fail if that is not passed in again.

Change-Id: I1ea578053c8d5136d09b3f503443bd0188ebca4f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:21 +00:00
Tobias Hunger
b913e9d548 ProjectExplorer: Make imported buildconfiguration active
Make the new buildconfiguration active after it was imported via
Project Mode. Before the buildconfiguration was added but the
current one was still set, which lead people to believe that the
build directory was wrong.

Task-number: QTCREATORBUG-18082
Change-Id: I10412d94326d9e21820dfcac89adbe2c5da948ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:14 +00:00
Tobias Hunger
eb8075f569 CMake: Compare canonical paths when checking source directory
Compare the CMAKE_HOME_DIRECTORY to the canonical project paths during
cmake project import. CMake makes sure to store the canonical path
there.

Change-Id: I4ae3ad1f8fab66a50ba98d4266c78cdb4d21f2ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:06 +00:00
hjk
77f8a4168f ProjectExplorer: Try harder to sort ProjectTree entries
Task-number: QTCREATORBUG-18081
Change-Id: Ie924a5969ee38b1a634fcd7cbbc46c0540f9d8a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-25 15:25:35 +00:00
Tim Jenssen
6a6dffb9c6 QmlDesigner: improve check class hierarchy code
- improve existing superClasses() via using transform (internal it uses
   reserve, shorter, ...)
 - remove unused superClassNames() if necessary it can be done by a
   simple transform call
 - introduce and use classHierarchy() and fix foreach loop which was using
   wrong "modelNode" instead of "superClass"

Change-Id: Ia52bcbd322f3a047a020faf4a67aca2a1b8fd19a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-25 15:14:23 +00:00
Eike Ziller
56233f67e1 Merge remote-tracking branch 'origin/4.3'
Change-Id: I01d7d8aa282f2bca94f85f55c832c76672e229f7
2017-04-25 16:15:04 +02:00
Thomas Hartmann
56e1749599 QmlDesigner: Do not override home and end keys
Those are not used and will not be used by the designer
and user reconfigure them e.g. on macOS.

Task-number: QTCREATORBUG-17968
Change-Id: I39d679cbce60de4c6951a82fa12d3c7c4fc630f3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 12:57:12 +00:00
Thomas Hartmann
2ad7b7bfcc QmlDesigner: Fix glitch in Add TabBar
With Qt 5.9 we have to first anchor the TabBar.
Otherwise the tab buttons are not layouted properly.

Change-Id: Ia20f2f6bbe8659f3b0be36ae3b56e8ce07b2dca1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 12:48:23 +00:00
Orgad Shaneh
73f210dad6 Gerrit: Support certificate validation
Certificate should be validated by default. Only if it fails, and the
user approves, we may skip validation.

Change-Id: I7696cd7dda2d6d7ef1aa616557d5619b63372028
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-04-25 12:34:08 +00:00
Eike Ziller
9443f7104b Remove the need to create ISnippetProvider subclasses
Change-Id: I1810aaa945136d9726a66dad41377429a6adc8e1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-25 12:03:08 +00:00
Thomas Hartmann
b952d0420e QmlDesigner: Update item library if error is fixed
If the document has an error (e.g. incomplete type information),
then it is required to update the item library if this error is fixed.

Change-Id: Iee9629879a0d3ee4bbc76dc0701f023e3c12f394
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 10:23:58 +00:00
hjk
fa6caa3b02 Debugger: Use proper placeholder in error message
Task-number: QTCREATORBUG-18078
Change-Id: I48cd8c24ca1236c69150f0d93b525a5a85447fff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-25 09:51:48 +00:00
Tobias Hunger
1e178915df AbstractProcessStep: Free output parser chain in error case
Change-Id: Ie0dc094068bfa56f728d84ee13e70efbc980f8b3
Reviewed-by: hjk <hjk@qt.io>
2017-04-25 09:23:21 +00:00
Tobias Hunger
6ef5a36b39 AbstractProcessStep: Make init fail if a process is still running
This should not happen, but better save than sorry.

Task-number: QTCREATORBUG-17984
Change-Id: I3efa8fb38a915ae29366f3ab715077b762d53828
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 09:22:49 +00:00
Tobias Hunger
b5ab98dfd5 CMake: Simplify code
Use defined helper method instead of duplicating code.

Change-Id: I1eec61f99875ccd28e6e64bd5ad2bfd7e6e21eb3
Reviewed-by: hjk <hjk@qt.io>
2017-04-25 09:22:33 +00:00
Tobias Hunger
79f5a27568 CMake: Use RCs buildSystemTarget when deciding what to build
Use the RCs buildSystemTarget property when deciding what to build
with the "build current executable only" property set. This makes
the selection more robust.

Change-Id: I0dbcd764a06428b441084e6e4dc680e106c6d3bd
Reviewed-by: hjk <hjk@qt.io>
2017-04-25 09:22:17 +00:00
Tobias Hunger
cad16c4bee CMake: Fix up file group information in server-mode
Server-mode reports a filegroup for all the listed headers and will
provide that without any information on the files (no language, include
paths, etc.).

Fix up file groups like these by using the best (with that being the
settings that effect the most other files) possible information for
these files.

CMake has no idea what headers are, so it has no way to provide any
better information, so Creator has to fix things up again:-/

Task-number: QTCREATORBUG-17971
Change-Id: Ib5ddab23cf725c7e03717b577cc9f9edc5bbfc61
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 09:21:16 +00:00
Tobias Hunger
ff46e67971 CMake: Use for instead of foreach
Change-Id: I4e2c929414cf1f7b052ae9f6846f43ae20fcee4c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 09:20:38 +00:00
Tobias Hunger
7a388e7b4b CMake: Improve emission of enabledChanged signals of build configurations
Change-Id: I542b93512466727ac4ee66a8ca41e503106ebdcb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2017-04-25 09:20:16 +00:00
Orgad Shaneh
46b7701398 Gerrit: Replace magic numbers with an enum
Change-Id: I591716865831877eda4a17e9c85169935d633b09
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-04-24 20:19:53 +00:00
Alessandro Portale
3624a663d8 Reduce usage of qApp in favor of static function calls
Q*Application classes have unusually many static functions. In many
cases in our code, these functions are unnecessarily called as instance
functions, using the qApp helper.

This patch replaces many occurencies of qApp with the according
Q*Application classname.

Change-Id: I6099a419fa7bf969891269c37ed7a9e817ef5124
Reviewed-by: hjk <hjk@qt.io>
2017-04-24 18:36:28 +00:00
Thomas Hartmann
893d4407eb ProjectExplorer: Ensure the FlatModel is build initially
If the FlatModel is created after a project is opened,
no update was triggered.

This was already fixed, but 8d1f4834b6fe79f992b3a44f8973d32dbc0dddb3
removed the update again.

Task-number: QTCREATORBUG-17690
Change-Id: Ide9499a6579a363f43d6cde2f1a865eddc816d9c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-24 14:57:31 +00:00
hjk
07884645af Debugger et al: Move code from DebuggerRunControl to DebuggerRunTool
It's tool specific, so put it into the tool (only) related code.

The additional level of indirection will go again, plus the original
one will be removed once the *DebugSupport classes can directly
use DebuggerRunTool as base.

Change-Id: Ieaa386a0f7d724b09cedaaba8fb7d1e6dc4ad55b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-24 14:48:35 +00:00
hjk
ede80222da ProjectExplorer: Let the container node inherit the project icon
Task-number: QTCREATORBUG-17924
Change-Id: I774ad0ed19ca7f8cbcafe7b704e3e5c62137f4a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-24 13:25:12 +00:00
Thomas Hartmann
2e0e0539b3 QmlDesigner: Turn Q_ASSERT into QTC_ASSERT
I had this a couple of times and this does not seem fatal.

Change-Id: Id6d2101a5dc1bdc652e6ca8557c7dd8450399be4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-24 13:19:22 +00:00
hjk
d63abf5567 Debugger: Fix snapshot view icon size
Do what the other views do.

Change-Id: I27a12715806b5d5f73aaa0b756bb08ef1a66a021
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-24 12:25:24 +00:00
Eike Ziller
c702b543ed Help bookmarks: Remove reading old settings
Change-Id: Iae6b9174871937ba7c04f710b8b7a55ca6027d81
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-24 11:45:44 +00:00
Eike Ziller
4d6e33031b Fix that help bookmarks could get lost
When closing Qt Creator before the help bookmark model was set up, it
would write an empty list of bookmarks.

Task-number: QTCREATORBUG-17537
Change-Id: I638312f21dfa201a617a4eeafb7fa161726a36ff
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-24 11:44:26 +00:00
Tobias Hunger
a1ae4affc2 Project: Remove duplicates from file list
Remove duplicate entries from list of project files. The duplicate
entries used to be visible in e.g. the locator.

Change-Id: I4a58ff11bd37ff39f4c9186ae89a2d384894bc1e
Reviewed-by: hjk <hjk@qt.io>
2017-04-24 11:41:41 +00:00
hjk
e063ca68d0 Debugger: Dissolve Debugger::ActionDescription
ActionDescription was a horizontal layer of convenience functionality
covering (only) ex-AnalyzerBase based RunControl start scenarios
and gets in the way of target/tool orthogonalization.

So continue the path chosen with the removal of AnalyzerRunControl:
Remove ActionDescription by inlining into user code, then orthogonalize
tool-by-tool, then generalize again.

Change-Id: Ib597df3f4ad7b06bef06644458fa13ddca53afdb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-04-24 09:52:48 +00:00
Laurent Montel
2b80f9b89e Don't use return keyword when method doesn't return anything
Change-Id: Ia9757be7cb51fb946557d40134a93acd1aec0a94
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-24 09:38:50 +00:00
Tim Jenssen
ff7e757ddd QmlDesigner: use default initializer where possible
Change-Id: I9bde2421a5cc99b1c815b568fa2a4a2e722b852d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-24 09:19:49 +00:00
Tim Jenssen
19e1eacfb2 QmlDesigner: white space only changes
Change-Id: I8df6b1f53fce79fdf9eed022bc189754e668589b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-24 09:17:47 +00:00
David Schulz
bd9a80717e Debugger: cdb extension version bump
Change-Id: Ie4460e5d0fafd1f599b24c4a5860510df86dcebe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-24 08:42:55 +00:00
Tobias Hunger
8793d0f0fa QmlProject: List .qmlproject file in project tree
Task-number: QTCREATORBUG-18057
Change-Id: I6a38093d1b6fdaeac7920746395cfbebc595d062
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-04-24 07:48:35 +00:00
Christian Stenger
e821b98c11 QmlJS: Fix compile using Qt5.6 on macOS
Change-Id: I3d8dd1ad1d149be24d9a3af1c9a5e8bfb4228c67
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-24 05:03:38 +00:00
Christian Kandeler
438ff54ad6 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: I87bfceca8e425284b63644d9d1e541b33a8dcfca
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-21 14:29:33 +00:00
Eike Ziller
dae2556d2f Merge remote-tracking branch 'origin/4.3'
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
2017-04-21 15:30:00 +02:00
Eike Ziller
1891af4b07 Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
Currently it is set by passing defines to qmake, which complicates
package build setups.
Set the display version where the numerical version is defined. This
also makes it available to developer builds. Also switch around the
display version and numerical version in the about dialog, since e.g.
"4.3.0-rc1" is more descriptive than "4.2.83".

Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-21 13:28:54 +00:00
hjk
ac86b2e8dd Debugger: One more sanity check
Change-Id: I2d788dd48415c4429f9456129e09e8fe1a9dffb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-21 13:08:20 +00:00
Montel Laurent
158ab3316e Use QString::*Ref method
Change-Id: I63a10f274dd17e08b5b8a2577762cc9f7960b5af
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-21 12:04:38 +00:00
hjk
384d141aac Debugger: Use a qobject_cast instead of some static_cast
The underlying assumption may be violated soon, make it
easier to debug if it breaks.

Change-Id: I7511d5677659e266f2d01db8bafb46bcd93d7f7b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-21 11:59:41 +00:00
hjk
230524da16 ProjectExplorer: Dissolve SimpleRunControl
As planned.

Change-Id: I9d9349cdd174c47b2331095fbe545b811e6ca770
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-21 10:36:15 +00:00