Commit Graph

32962 Commits

Author SHA1 Message Date
hjk
20f486281e QmakeProject: Don't deny deployment to not precisely known targets
Fall back to what we do for Windows/Linux/BSD and the rest of
Unix anyway.

The target architecture/os detection process is conceptually
not precise. Refusing to do anything at all, including steps like
copying files which do not depend on precise architecture data
anyway, is overshooting.

Change-Id: Ic6c98c4dac5fe4a625149be558c8b02440f8fdbc
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-02 15:11:39 +02:00
David Schulz
78c707760e Cpp: Adjust includes when files are renamed.
Change-Id: Ie6aaaa5d99ba3823d9d42331f45b2dcab397e1cd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-02 15:09:20 +02:00
hjk
b210294c86 ProjectExplorer: Remove connection
That was not removed in a83bf58b. The slot was moved into a lambda,
but the connection was not removed.

Change-Id: Ieb2883f9721b1b513c56aa95625b7ae038a33ad0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-02 14:54:10 +02:00
hjk
c3d55594ff RemoteLinux: Don't check toolchains to enable deploy steps
That can be too restrictive.

Change-Id: Iedaa6ce0f97c424efbe4046ce13c05025b222523
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-02 14:54:02 +02:00
Daniel Teske
f0bfff8183 Android: Be more careful in androidVirtualDevices()
The backtrace in QTCREATORBUG-13081 suggest that something with
dev.serialNumber is wrong. The input (attached to the bug report) does
not indicate why we would misparse it. So add checking code
to all places where we index into line.

Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-10-02 14:05:44 +02:00
Ulf Hermann
4481925b1a QmlProfiler: Fix next/previous selection in timeline
If we've changed the model index we don't reuse the item index for
selecting the next item. Also, there are two reasons why
firstIndexNoParents() can return -1. They have to be handled
differently.

Change-Id: Ib33e3bd0e96a39a71658a0e4509926012a91bf27
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-02 11:28:04 +02:00
Ulf Hermann
0f3f3df36c QmlProfiler: Center trace view vertically around newly selected items
It's rather unintuitive if it only centers horizontally.

Change-Id: I9245da0b26fccc14a100804715d09aaa82059413
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-02 11:27:41 +02:00
Ulf Hermann
95a13d57c8 QmlProfiler: propagate selections from trace to event view by typeId
This is faster and more accurate than propagating by source location.

Change-Id: I6aed3b1591380b49dd7c56a66bdc35912570e347
Task-number: QTCREATORBUG-12932
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-02 11:27:28 +02:00
hjk
7dfbb1b199 TextEditor: Remove HighLighterFactory
Unused.

Change-Id: Idd9805756c51e025e99842fa6fc8707b10927c4d
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-02 10:42:50 +02:00
hjk
f566d7eae0 TextEditor: Make mark requests operate on widgets, not editor
Removes some widget->editor->signal->slot->widget indirection.

Change-Id: I7951d62ad3b7477e4693798d85c53c932b86c95e
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-02 10:42:43 +02:00
hjk
af23e254df CppEditor: Make connect refactoring work with 3-args form
Change-Id: I256753726cd543e157663faddabf960b26b04300
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-02 10:42:28 +02:00
Tobias Hunger
3277180b0c JsonWizard: Replace Python FileWizard with a JsonWizard
Change-Id: Iebeae1f52cf856e009a0910118829c89dd3ea222
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-01 12:15:03 +02:00
Daniel Teske
c5dd04f159 QmakeProject: Also update deploy configurations after incremental parse
Change-Id: I792da9e8ef836c3226bfb84d671cbf4f43244914
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-01 11:48:23 +02:00
Christian Kandeler
a68d76cef2 CPlusPlus: Fix qbs build.
Change-Id: Id38252d7e24bccc2a0c4bf2631d98da632c16533
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-01 09:45:13 +02:00
Tobias Hunger
c12c8b27da White-space only fix
Change-Id: Ic9184841126af21a9849ab52cde6027cf89a40a6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-09-30 18:00:23 +02:00
hjk
9b8c6c6012 CppEditor: Add quickfix to convert to new style connect()
Limitations:
 * Overloads are not yet handled
 * Action is not offered if the slot can't be looked up in the
   receiver expression (e.g. when it's a base class pointer).

Change-Id: I5779ff1b74657025d058d4f3690f6723b4784497
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-30 17:58:00 +02:00
Tobias Hunger
ac02f6fb89 JsonWizard: Replace TextFileWizard with JsonWizard
Change-Id: Iae2833554529c2f333d9781eb0f7fa28f3bfde79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:29:16 +02:00
Tobias Hunger
ed8a9cba2b JsonWizard: Replace Java wizard with JsonWizard
Change-Id: I93fc26e48b39635662662a9ab4040f45fa874876
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:29:08 +02:00
Tobias Hunger
161f33d08a JsonWizard: Replace GLSL wizards with JsonWizard
Change-Id: Ieeeec4d1a023b7cca19e3bd23ba1aa6dd1d76e72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:28:58 +02:00
Daniel Teske
bb7a6f923c TextEditor: Move setting up of encoding label to ctor
Task-number: QTCREATORBUG-9794
Change-Id: Ia01e71b67ed31f21234ee26c508149173d16c503
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-30 16:00:46 +02:00
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
Christian Kandeler
d39f8fd310 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I8594101d87130eab8e5abdbf288ffe119bdec1d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-30 12:41:14 +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
Orgad Shaneh
f81b407ca0 Core: Revert function signature change
Breaks BC with MSVC2010.

This partially reverts commit fe8ed7f5a6.

Change-Id: I36f995f992f3d12f16900c6dbe1dc94123c188bd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-30 10:50:13 +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
marcel
7852d61dda Re-add Label for action JumpToFileUnderCursorInNextSplit.
The label got lost in f1eb9c4827

Change-Id: Idedbc471a2ea6104e900d626ff7b424d51092624
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-29 14:50:26 +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
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