Commit Graph

40031 Commits

Author SHA1 Message Date
Tobias Hunger
6c49356471 JsonWizard: Allow for descriptions of wizards
Allow for descriptions of project wizards that will be displayed in the
Project location page.

Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-24 14:56:21 +00:00
hjk
c992a9ff08 Debugger: Add dumpers for QPolygon{,F} and QGraphicsPolygonItem
Change-Id: Ic246b28d44312a677c8d41194d4e0c324bda125d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:48:33 +00:00
Eike Ziller
5b98fcf7f9 Mime types: Fix opening files with mime types with multiple inheritance
It was opening e.g. ruby files in the binary editor because the ruby mime
type inherits from application/x-executable (which inherits from
application/octet-stream) as well as text/plain, and it was searching
depth-first.

Task-number: QTCREATORBUG-13996
Change-Id: I1980d7ed04fabf111f8fb76df657225ae9ebe552
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 14:46:54 +00:00
hjk
da8270e1d0 ProjectExplorer: Move private slots to Pimpl
Change-Id: I62a8f4f0e94b3e9f85e9a88f3447c5fbfdd38295
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 14:45:32 +00:00
hjk
2ee4363d1d Debugger: Force LLDB round trip between stack and locals update
The stack might produce data (such as as the QML context in
native mixed debugging) that is needed for locals display.
While this doesn't work yet with LLDB anyway, the change
suppresses one soft access when accessing the top frame of
an empty stack (the usual case on the first update).

Change-Id: If931fbe940b8cda01cc6cc34429a2fcb33cd8d19
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:31:32 +00:00
hjk
37bd3eab24 Debugger: Visually fake instant breakpoint removal
This partially reverts 38ec4dd6ae.
After using the new, "correct" behavior for some time I am
convinced that the original felt indeed better.

Change-Id: Ia921ccf8410bec33eb3053dc91bcca7b0328ef38
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:31:23 +00:00
hjk
592ffe7377 SettingsDialog: Remove CategoryId parameter from callers
PageIds are supposed to be unique, so the CategoryId can be determined
from the PageId. Look for PageIds in the already expanded categories
first before searching through expensive categories.

Change-Id: I006beb0df6183453163ac1810fe59a306a0f52b1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-24 13:52:00 +00:00
Tobias Hunger
655eed467e QmakeProjectManager: Fix typo in method name
Change-Id: I63a1ca0c9fd4ef1a6af758179e315fc7ec96eeb4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 13:39:26 +00:00
Tobias Hunger
86b5b5c2f3 VcsBaseSubmitEditor: Remove queued connection
Those should no longer be necessary and some people report warnings
about queueing Qt::ApplicationState when doing commits in creator.

Change-Id: I7bf1be57b8a92212ef677d1a608c0f22d20cab8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 13:39:18 +00:00
hjk
3a7a1c2164 Debugger: Make some LLDB warning not break output format
Dumper.warn() tries to interleave the message with an
ongoing report, whereas the global warn prints directly,
possibly breaking the report parsing.

Change-Id: If753773d5eedf98a489f155d46d2911e04059461
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 13:27:23 +00:00
Orgad Shaneh
fa9deea671 Core: Minor optimizations in DocumentModel
Required for followup changes

Change-Id: I6280427433bd88fedf87e4d8d25c2f7481d94210
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 11:58:02 +00:00
Alessandro Portale
fb567a224d Fix layouts for OSX: Set the obligatory ExpandingFieldsGrow
In Qt Creator, we want line edits to take up the free horizontal
space.

Change-Id: I4ff78035ab2481cc2f944fc02569638f06f0b090
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 11:45:53 +00:00
Christian Kandeler
e5784b6964 QbsProjectManager: Set cpp.compilerPathByLanguage.
To work around the "-x" bug in icecream.

Change-Id: I7d95aa120ad344f6662c265fe81ab98752c7cd1e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-24 10:53:11 +00:00
Alessandro Portale
cf82da2b91 Gerrit Push Dialog: Let Commits list take the free space
When resizing the dialog, the Commits list should take the free
space.

Change-Id: I6586f43f8f43a4563327867e29630626f4a6e00a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 10:32:35 +00:00
hjk
4198cc1441 Debugger: Don't re-check pending LLDB breakpoints
This partially reverts change 1d1695c2.

This doesn't seem to be needed with recent versions of LLDB anymore
and removes one source of "spurious" breakpoint-changed events.

Change-Id: I8140944a46bbc83173c0088117a88110b0872e8a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:55:35 +00:00
Eike Ziller
8b17f10cd4 MimeDatabase: Fix remaining problems with overriding mime types
If mime info is requested during Qt Creator's initialization cycle, the
mime files might be parsed before all custom types are registered. To
ensure that custom mime types override the built-in ones we must force a
complete reload after they are registered.

Change-Id: I94032a5efe1bbc22885cbeb1f43080270c23381c
Task-number: QTCREATORBUG-13995
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:47:06 +00:00
Eike Ziller
4e53c23b4b Mime types: Fix that some QML files were opened as C++
We registered a mime type "application/x-qml" conflicting with "text/x-
qml" from freedesktop.org.xml. The magic matcher of the C++ mime types
might kick in, in that case.

Task-number: QTCREATORBUG-13994
Change-Id: I5900c233b42681d7b7d3af185d6ff3e1c4166e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:46:04 +00:00
hjk
53de7045ae Debugger: Fix some LLDB breakpoint state transition
Breakpoints inserted before application start are not
just 'InsertRequested' but already 'InsertProceeding'.

Change-Id: I1df37d15f74ea65771843f6eab2e724d2bb0cd23
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 08:59:34 +00:00
hjk
45b58ac2e8 Use Qt5 connects in ProjectExplorer and Session
This is a first, self-contained step only: Replac the connects
themselves, rename private slots that coincide with
signal names, apply minimal compile fixes and formatting.

Change-Id: I0a28d2ebcf4d4f6fdf68a06f582ed962ed54724d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-23 18:07:43 +00:00
Christian Kandeler
0c22a610de Update qbs submodule.
To HEAD of master branch.

Change-Id: I6991c6dc4d39beb47dbf8b66e6dff7715369e765
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 16:53:08 +00:00
Tobias Hunger
3232af6272 DiffEditor: Fix selection of next view
Change-Id: I3754bb3637fc89d4c9ef2939db25dd1fda9d3243
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 15:02:29 +00:00
Tobias Hunger
f9f6f0b2c9 DiffEditor: Introduce a base class for the different views
... of the diff. Currently that is side-by-side and unified, just
as before.

Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 13:28:08 +00:00
Christian Stenger
7121315a71 Utils: Fix propagation of underlying tree model
Change-Id: I23739cb4c7a19a5c5bcdc8bf39c36db689292b62
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-23 11:52:56 +00:00
Thomas Hartmann
a2aaf0f6eb Fix assert for m_objectInstanceHash
The hash was not cleaned up in any case and sometimes a new object
gets allocated at the exact same address.
To avoid leaking hashes in m_objectInstanceHash and to avoid the assert,
we remove any deleted QObject from the hash.

Change-Id: I2697ab2b2430ad47932841fb9c0ef88ffa4cbbb1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-23 11:52:49 +00:00
hjk
54ce123a26 ProjectExplorer: Add runStartupProject() convenience function
The usage pattern seems to be used often enough to justify a function.

Change-Id: Iecdeb2b42879f419154902e685d0d13e8cae8b33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-23 11:01:56 +00:00
hjk
6fb766bf43 SettingsDialog: Modernize connections
Change-Id: Ie157b9b36a13b3e6eba5c158040e7491bd2ff29d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-23 10:54:39 +00:00
Christian Kandeler
1104a6602b Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: Ifce05da069397336b21081d797de07dcaf4d96fc
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 09:59:39 +00:00
Christian Kandeler
25a14aa2e2 RemoteLinux: Use QtcProcess::join() to display argument list.
Otherwise, we lose quotes on a round-trip.

Task-number: QTCREATORBUG-14002
Change-Id: If7ecd17dfcb310aa10d9f83ddbd215c5b7136546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-02-23 09:58:31 +00:00
Tim Jenssen
48cb9f124d improve process finished message
Change-Id: Id045df62c953954ae18d62c5f128d4ed46dc9aeb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-23 09:13:17 +00:00
Christian Kandeler
2244adcca8 SSH: Add support for SHA-256 HMAC.
As recommended in RFC 6668.

Task-number: QTCREATORBUG-14008
Change-Id: Icd4613dda9cce2b482499c626b863c17e8fa0c20
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-20 14:59:09 +00:00
Friedemann Kleint
143af2845d Fix excessive warnings by MSVC 2013 64bit about size_t->int truncation
C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data

Change-Id: I91979c685bbbd84359f7f4e19911a21a408f5d23
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-20 14:27:51 +00:00
Nikolai Kosjar
21e9893b4b CppTools: Fix completing qt5 style signals/slots in connect()
* Fix qualifying the member function, take namespace into account
* Fallback to usual completion if we cannot provide anything
* Ensure that the completion is not triggered outside connect() calls
* Change to a two step process:

    1. connect(obj, &         // offer class name completion
    2. connect(obj, &N::Foo:: // offer signal completions

  ...same for the 4th. argument.

Change-Id: Ifa4c74cde1b96ec7c544daaeefc47c4efdd8294a
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-20 13:11:17 +00:00
Orgad Shaneh
f3a2795c3b C++: Use correct features for document parsing
Task-number: QTCREATORBUG-8007
Change-Id: Ic96aaa433442812a99bac9d16bb9124d66762e8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-20 12:54:49 +00:00
hjk
97cbfb95bb Add manual test code to check generated code size
Change-Id: Idc65f441c3af09f1fcd5cff646cc7b472aed1770
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-20 10:01:09 +00:00
hjk
63247edd90 Analyzer: Reduce explicit use of RunMode enum
Change-Id: Idcdeb2b42879f419154902e685d0d13e8cae8b33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-20 09:35:27 +00:00
hjk
813e995ebf Analyzer: Reduce explicit use of StartMode enum
Change-Id: I27b1d06395dea940c8dd39cd2bd41fc09cee3a9c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-20 09:35:24 +00:00
Tobias Hunger
1eb36bb1d3 SVN: Save description as utf-8 string
We tell SVN that the file is utf-8, so we need to make sure we save it as
such.

Task-number: QTCREATORBUG-13979
Change-Id: I49edf477bf80c6b21cd99bc86fbd2555d7181a0b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-20 09:00:16 +00:00
Tobias Hunger
16f9e10e72 VcsBase: Make the description directly available in Submit Editor
Make the description directly available to subclasses of the submit
editor.

Change-Id: Ieb6f99091fdcb6f794491169e637bec53a04dacb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-20 08:59:27 +00:00
Tobias Hunger
541dde7ecc SVN: Remove commented out code
Change-Id: Ie1a3a73b553840a700e4c8dc229c6902afdafdc4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-20 08:22:35 +00:00
hjk
6c9ea34f9f Core: Modernize connections in ExternalToolManager
Change-Id: I1be66d132886da0b1bde4fe5578fc64bcd2f8e98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 14:09:53 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 13:35:45 +00:00
hjk
289e660fb7 Debugger: Simplify code to open disassembler view from context menu
Also, correct an off-by-one in column "computation" that always
resulted in "no function" here from the C++ model which assumes
column count starting at 1.

Change-Id: I9a34d4ffaaa25131d5a130c57ec10f1ce8e8a184
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:53:06 +00:00
hjk
50b3f7c69a Core: MainWindow code cosmetics
Modernize connections, namespace Utils, include order.

Change-Id: Ic2e414dd4fb55821c6314bfc5256ce166fd70c2e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:37:32 +00:00
hjk
aab3b6f816 Analyzer: Move isRunnable() decision to AnalyzerAction
Closer to where the information is.

Change-Id: I3ff7e933a99baf8a18e6532213aef0539a364a76
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:37:04 +00:00
hjk
9d707ac63c Analyzers: Various cleanups
Fallout after the demise of IAnalizerTool.

Change-Id: I68f936ed5f2929dc4f09a408bdf6b0ea38e568ef
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:36:52 +00:00
Eike Ziller
567c6eb875 Add changes-3.3.1
Change-Id: I56d0e82f69e604aca3dc65940218ed471d203516
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
v3.3.1
2015-02-19 10:16:46 +00:00
Ulf Hermann
8b8f8ca2ba Allow QML profiling when using Qt Quick compiler
Change-Id: I40784b51e36c3c77fce6bf077613d19579336db6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-19 10:09:07 +00:00
hjk
23ad61fc9d Debugger: Dissolve ConditionalBreakPointCookie structure
After dropping the QVariant cookies the structure is not needed.

Change-Id: Ib6f702bedeb250518ac0b7019e32d2caa62eb616
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-02-19 09:13:08 +00:00
hjk
c3184ee790 Valgrind: Simplify callgrind context menu creation
Change-Id: I5ea4bdf2dc6f4d3867e6abbc8d4cd6a1149a17b2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 08:55:03 +00:00
Thomas Hartmann
ee2a64d875 QmlDesigner: Fix clang warning
Change-Id: Ie783b8e32697a286cabbf25b06d06578d62a7340
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-19 08:18:31 +00:00