Commit Graph

38241 Commits

Author SHA1 Message Date
hjk
beef480783 TextEditor: Simplify HoverHandler handling
The editor factories are already a central place to associate
hover handlers with editors, no need to retrieve them later from
the object pool again. This also allows for easy handling of
more than one active handler per editor.

Change-Id: Ie716b96f5ce6b526ee897468635e03e909d81538
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-30 15:46:34 +02:00
Tobias Hunger
b1cc98f79b JsonWizard: Support formatting of sources after creating contents
Change-Id: Ia0fbae6a1d1b2f3dd00c578a8d1ac60e0482fba9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 15:14:45 +02:00
Tobias Hunger
989ed95c1f CppEditor: Replace CppFileWizard with two JsonWizards
Change-Id: If39ed6d2711fa4cc144d1b1f9738acf3d04ac225
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-30 15:14:29 +02:00
hjk
335e625bdc TextEditor: Flatten QuickFixAssistProcessor hierarchy
{Cpp,QmlJS}QuickFixProcessor were doing the same (storing a single
pointer to a IAssistProvider). This could be done in the base
class with the leaf classes removed.

Change-Id: I0e419f37c5547d5ddfcfd1a767d356040dd7e56f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-30 13:40:03 +02:00
Eike Ziller
81cb471997 Editors: Support dragging from outline views
Fill the line and column information in the location returned by
QmlOutlineModel::sourceLocation for that.
The drag & drop code also needed a way to override the executed drop
action for file drops, because the QML outline supports move-drags, which
would lead to the items being removed from the outline when dragged onto
a split...

Change-Id: I2478abc7d5aa2f3aa676cdd609ecb69a50adce8c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-30 13:08:49 +02:00
Daniel Teske
92c4f26e99 FlatModel: Sort projectnodes by path if they have the same displayname
Makes testing easier

Change-Id: I8dd6a01e6c82aec9e6ac37c999934083f72f5355
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-09-30 12:01:23 +02:00
Christian Kandeler
02a97ab9ef CppEditor: Use correct include type.
Change-Id: I9c02e0f7b9701ffac9a2c05d240573e65464fb52
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-30 11:55:11 +02:00
Tobias Hunger
31b83d27e8 ResourceEditor: Replace ResourceWizard with a JsonWizard
Change-Id: I0fb76c8627f65329d1bfebecf44cc3c75e6b07b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 10:56:32 +02:00
Tobias Hunger
f51fcacacb JsonWizard: Add File- and Summary pages
These reuse the existing pages we use for other wizards.

Change-Id: Ic505204e0988a6b44d112da35748f81d9f8e2c1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 10:56:17 +02:00
hjk
9ebb63c78f CppEditor: Simplify CppQuickFixOperation interface
Change-Id: I5c047cf5e2bffa2f7c19c145c4f8d0adf3e64533
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-30 09:38:25 +02:00
Orgad Shaneh
0c84f2d3e2 DiffEditor: Cleanup
Change-Id: I427c3272027a516f8271fc3ccc7ecc6a7cca40fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-29 22:20:01 +02:00
Orgad Shaneh
b26e5a1970 Debugger: Fix wrong display of \r and \n
10 is \n and 13 is \r...

This partially reverts commit caca06adbd.

Change-Id: I6b8cba940213c1f5acb7737c3c99646db0f5699f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-29 20:51:02 +02:00
Jake Petroules
536944a318 Qbs: fix run environment to behave correctly like qbs run.
This allows Qbs to correctly set DYLD_LIBRARY_PATH and
DYLD_FRAMEWORK_PATH for OS X and iOS platforms.

Change-Id: I9d3093bc0b4a377f08e8cc737139d02a2158c4ea
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-29 17:55:41 +02:00
Jake Petroules
631ee70cc7 Qbs: refactor property provider.
Set toolchain list centrally.

Set target OS for additional operating systems: WinRT, Windows CE,
Android, FreeBSD, NetBSD, OpenBSD, BSD (generic), BlackBerry, QNX,
and Solaris.

No more "else assumptions" which would for example detect Clang on
Windows as MSVC, any non-Clang toolchains as GCC, or any unrecognized
operating systems as Unix.

bsd4 is gone as it is not necessary in any practical sense (and no other
operating systems have different identifiers by version -- there is a
dedicated hostOSVersion property anyways).

Detect iOS without relying on Qt.

Change-Id: I38e2adf188d4604182ec84003dc5d281fce025cc
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-29 17:32:49 +02:00
Ulf Hermann
544783cf2a ProjectExplorer: Avoid static initialization fiasko
The search paths can only be constructed once the extension system is
ready. This may never happen if the plugin is loaded directly, e.g.
from an autotest.

Change-Id: Ibfcb7bbb6138480d772d5097aaa8b0ae44d1b043
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-29 14:58:43 +02:00
hjk
10c8d5f0ca TextEditor: Rename BaseTextEditorWidget to TextEditorWidget
... and some of the related implementation details

Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-29 14:54:32 +02:00
Ulf Hermann
cfaa30d0b9 QmlProfiler: Eliminate ambiguity from TimelineModelAggregator::count()
It wasn't helpful that this method could either count all events or
only the events from a specific model.

Change-Id: I09dcb37edd3403a23f6ee9008fc71b6761aa9e26
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 14:28:10 +02:00
Ulf Hermann
dbb4e761ef QmlProfiler: Update abstracttimelinemodel test
height() needs a modelmanager now and rowCount() is centralized.

Change-Id: I7fc1833d4bb5de4df99bed0e43f1da836e45df21
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 14:26:55 +02:00
Ulf Hermann
9e0aff993e QmlProfiler: Don't try to get ID of invalid selection.
This fixes an out-of-bounds array access.

Change-Id: Ia572d87ba00160f0869d8c7ab2941b4f9bc403f5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 14:08:26 +02:00
Eike Ziller
6daeaf3bd6 Fix follow symbol in next split, and simplify code
Follow symbol in next split broke with fd9b2af921
because the flag was no longer handled through EditorManager::openEditorAt
Also remove the flag NoNewSplits which is no longer used, and simplify
how links are opened from the C++ editor.

Change-Id: I845cc3a0a43d82b79d5c46a273232b69fd6e3ea9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-29 13:42:35 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
2014-09-29 13:40:53 +02:00
Ulf Hermann
b2487e1683 QmlProfiler: Introduce properties for timeline category heights
Like this we can easily refer to them from QML and it makes it simpler
to see if we mean the overall height or the height of a single category.

Change-Id: Ia2b79d99b5c46c3d9563cfc2ed0715bc352ce9b4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:19:23 +02:00
Ulf Hermann
2919dc617f QmlProfiler: set overview range slider right border to correct value
Change-Id: I64e721e11aa1a8d7a678f0f0a4573c7f7a885380
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:12:43 +02:00
Ulf Hermann
16ebc76277 QmlProfiler: fix finding of first/last events in SortedTimelineModel
SortedTimelineModel's find methods were off by one if the given time
was exactly the start or end time of the first or last element.

Change-Id: I34e7813af5a32f1a9f9b8af9c17f970e68b5e58f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:10:44 +02:00
Ulf Hermann
34372ecde4 QmlProfiler: Prevent V8 model from reading unrelated trace data
Change-Id: I2b079af208cfbe9969749847685da80fdff9be90
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:09:15 +02:00
Ulf Hermann
3c094eeeb7 QmlProfiler: Make most of SortedTimelineModel protected
We don't want anyone to insert stuff into the ranges without reflecting
it in the actual data.

Change-Id: Iaa8cc9a962216ba466da2c468826f6fbf6bef11c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:08:43 +02:00
Ulf Hermann
f6d8d4843d QmlProfiler: method for getting modelId from AbstractTimelineModel
Change-Id: I8e20f70b0e6959f32e1a6e8731cab73da07986b9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:08:20 +02:00
Ulf Hermann
71ac095612 QmlProfiler: Store typeIds in range data
We'll need to refer to them for additional global metadata.

Change-Id: I717d3199b5ce8846c273b93bb8cd31fe3941035b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:07:38 +02:00
Ulf Hermann
38f4d6a5f2 QmlProfiler: rename "eventId" fields to "typeId" and "selectionId"
The convention is now that selections are the rows in the expanded
timeline, "types" are the types in the QmlProfilerDataModel, and
events are the single boxes in the timeline. Thus, the event view
shows only types and for consistency the V8 view does so, too.

Having eventId as synonym for "type index" and "event index" as
actual index into the list of events is confusing.

Change-Id: I6b7c4c3f1ab0a8b71c511de52ab296a2e91cf5f0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:06:45 +02:00
Tobias Hunger
3af3878ace JsonWizard: Make wizards translatable
Change-Id: Ia496829dd3070ef65b2cec31ecaf30955b2900c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-29 12:10:50 +02:00
Andre Hartmann
6bf9a19276 Generic Project: Fix adding wrong include directories
Task-number: QTCREATORBUG-12727
Task-number: QTCREATORBUG-12873
Change-Id: I1dffad5af9ac254fa17f89291db7baf640ed1851
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-29 12:05:54 +02:00
Daniel Teske
f39a86f70e LdParser: Use QRegularExpression
Change-Id: I0c183894389d92178a469fe2980568b7517a153c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-29 11:20:37 +02:00
Eike Ziller
0aecf9c195 Merge remote-tracking branch 'origin/3.1' into 3.2
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
2014-09-29 10:31:12 +02:00
hjk
2407c29768 Added changes-3.3.0 file
Change-Id: I5b3b0595f9d33f3c0e419cc01612295564307d39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-29 10:25:41 +02:00
David Schulz
7059353520 Perforce: Disable actions when outside a repository.
Task-number: QTCREATORBUG-13092
Change-Id: I3d059af748f0160ebfc97bebbd43de9210f17250
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-29 09:50:27 +02:00
Orgad Shaneh
b1aa9bf223 TextEditor: Adapt include guards to file rename
Change-Id: I1bb8cb6baec091fd924b3738f93a83196c22d807
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-29 09:26:03 +02:00
Erik Verbruggen
fdf6f83a99 QML Debugger: prevent possible nullptr deref.
Change-Id: I9a3766665bae737a15aac18900185edb2c0ad87b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 09:00:49 +02:00
jkobus
5c6b1373c4 DiffEditor: Use settings' foreground color for highlights
Simplify drawing highlights by passing selections
into a drawing function.
Reduce selections which are covered completely by
other selections.

Task-number: QTCREATORBUG-12844
Change-Id: If282d5c881d25cac1b8db4ac8dfc45d47b0b8580
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-29 08:21:34 +02:00
hjk
cb4f04f416 Debugger: Remove unused fix cdb integer functions
Change-Id: I60e379fdc36f67fdd8fc2d0d440ed41a82374f97
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-29 07:19:58 +02:00
Orgad Shaneh
1154aab0b7 Debugger: Fix crash on regexp matching
Conversion of QList to QVector required further adaptations.

Instead of trying to match all expressions, break on first match.

Change-Id: I76d67ae876687ac15f3099a0a26eac582ad73c76
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 22:53:50 +02:00
Orgad Shaneh
c218c051c6 Debugger: Support variables for target
Useful for e.g. substituting any build dir to current project dir.

Change-Id: I50e8c101fa39bd45e55eef65776b18ef76bfd6ad
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 20:58:46 +02:00
Leena Miettinen
38f2487a48 Doc: Convert connect() to Qt 5 Style refactoring action
Change-Id: I4387067424c50aa7097509a129353baf6c7ddddd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 20:51:19 +02:00
hjk
e11bbac671 TextEditor: Add a convenience append method for quick fixes
Less noise on the user side.

Change-Id: Ia5b495a1f9d3ec43623056d793f6771b3b84fd6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-26 18:55:50 +02:00
Tim Jenssen
14022854d4 QmlDesigner: Use QQuickWidget again
This is the revert of the reverts ;)

Change-Id: I750dfffa6d509e058b97b605be5f2cc0a42c28f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-26 16:48:38 +02:00
Daniel Teske
d1dd7fe369 AppOutputPane: Fix possible use after free
Task-number: QTCREATORBUG-13022
Change-Id: Iaf763541c3876778576be09f50a2977d0d6d1b41
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-26 16:34:33 +02:00
Christian Stenger
02c260e6ca Tests: Fix compile
Introduced with 953cdb971f

Change-Id: I9d69cfcff1778e8428a6da18fc300d8aaaac2904
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 16:12:03 +02:00
Robert Loehning
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-26 15:42:30 +02:00
Tim Jenssen
2bd550f3fd QmlDesigner: import only working imports
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-26 15:13:39 +02:00
Eike Ziller
a56432b3b1 Share code between "central" and other help viewers.
This removes a lot of duplication of actions and interaction.
It's also a preparation step into making the external help
window behave more like the full-fledged help mode.

Change-Id: I318d831f229b0a75bb8702a5f163c96cce6a668c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 14:49:09 +02:00
Robert Loehning
9d3ae49e30 Session: Fix compilation
This was broken in fe8ed7f5a6

Change-Id: Iff4dffa6ba6cfdeeb3664c026ce642b80e4deeeb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-26 14:48:57 +02:00