Commit Graph

39480 Commits

Author SHA1 Message Date
Daniel Teske
64e8b8a06e Fix crash in FolderNavigationWidget
Introduced in 1ed12d39f1

Change-Id: I623e081a6abc80bd6926daf55fc18ab0cb400863
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-19 15:50:41 +01:00
Alessandro Portale
bc46e179cd Utils: Add medium sized round indicator
Change-Id: I7f66f63a905e1a9abf7905816dbd86ec3a8951ed
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 15:44:07 +01:00
Daniel Teske
21a5766cee Android: Handle library building in a more user friendly way
Task-number: QTCREATORBUG-13566
Change-Id: I47bf76d1f559bf1addae0e3d577e0207b4de4150
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-19 15:03:30 +01:00
Daniel Teske
6339ddfc43 AndroidDeployQt: If the user wants to reinstall, do it immediately
Task-number: QTCREATORBUG-13427
Change-Id: I49ab3be15fc38df1564ee10f9515d92fbb6ff047
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-19 15:02:27 +01:00
Orgad Shaneh
8ab7f673d0 Fix qbs build
Change-Id: I8f3aeee7c45cffb839bc44109da107ee6b91c1ad
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-19 14:00:55 +01:00
Daniel Teske
37a336056a Android: Fix cloning of "Make install" step
Task-number: QTCREATORBUG-13819
Change-Id: Ibf9049cf00dfcfe25c8399c1fd39ae3b26e8fd23
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-19 13:56:01 +01:00
Daniel Teske
230be99474 Fix default wrong directory if no files are open in the editor
Task-number: QTCREATORBUG-13831
Change-Id: Iaeb11014ed16bc9f08d7c12d81c1b7b8a4163d21
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 13:34:10 +01:00
Daniel Teske
1ed12d39f1 Remove DocumentManager::currentFile, use DocumentManager::currentEditor
Change-Id: Ided1a14481cfbbcc49e901f3837e056582ff60e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 13:34:06 +01:00
Daniel Teske
a6ea380870 Fix compile
Change-Id: Ic39f9c8be45751978fcaa791a82dd64cc4f4efe5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 12:43:34 +01:00
Daniel Teske
a53dd9f003 Always show compile output/task window on clicking on progress bar
The output windows nowdays have a "focus-stealing" preventing mechanism,
where if a outputpane has focus, we typically don't switch but instead
flash the corresponding pane.

Maybe the api for outputpanes needs another rethinking to come up with
the correct enums.

Task-number: QTCREATORBUG-13646
Change-Id: I9db7da7e23206617f6da1c4d24ba8c2ba5583612
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 12:43:17 +01:00
Eike Ziller
4c63deae5c Git/VCS: Use spinning progress indicator for log view
Show a spinning progress indicator instead of the "Waiting for data"
text for e.g. the git log view and other commands that use
VcsBaseEditor.

Change-Id: Ie4c73f85397f8809bda6bb276140eb695d96174f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-19 10:45:35 +01:00
Tobias Hunger
8c3e68832e Core: Use class, not struct
Change-Id: Ib58e10c98b2cc379f0b5559c2758aecd7daf276a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-19 10:20:35 +01:00
Tobias Hunger
262f7f428f Vcs: Remove unused GetRepositoryRootOperation
Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-19 10:20:12 +01:00
Eike Ziller
bafdf36f80 Add easy way to add progress indicator overlay to a widget
Adds a way to 'attach' a progress indicator to a parent, so it
automatically keeps itself centered on the parent.
Also adds shortcut methods to BaseTreeView.

Change-Id: I962a9300d89ef5d1e03298d670e0cee781d3a4e5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-16 16:45:02 +01:00
hjk
7fec1199f3 Tests: Add a basic tree model iteration test
Change-Id: I6b4dff0909e87ab727cb8c5b5be6f6c25b687bf0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-16 14:57:16 +01:00
hjk
4f6279256d Tests: Move auto/utils_stringutils to auto/utils/stringutils
Change-Id: I475a5914f3b65656dc12cf7619bfed34e9fc8b74
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-16 13:32:41 +01:00
hjk
0f0f7f1d3f TreeModel: Fix tree level item iteration
If the first descend did not hit the desired level the iterator
was backing one level too much and failed to visit some items.

Change-Id: Ia0f48a101a9daa0ad9359d081fe1949009ba6e19
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-16 13:16:56 +01:00
hjk
0bf1c85b44 ProjectExplorer: Hide some KitOptionsPage implementation details.
Follows the recently established pattern.

Change-Id: I869da4df9d1d879ebff3ed7c45e8c33f376968a0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-16 12:41:55 +01:00
Erik Verbruggen
a6f835de8d OSX: fix build of manual test
Change-Id: I2e6a662770f15a565a784bdfad337ba7f2b9692a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-16 12:24:27 +01:00
Christian Stenger
377052bfac PluginManager: Fix compile for release builds
Issue was introduced with 273c3fa0af

Change-Id: I09d3691c549cbca34d48725f092273e781af20ab
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-16 08:23:46 +01:00
Orgad Shaneh
50a5056b10 Fix test compilation
Change-Id: Iac9aa792c65c8d35b16ea23d9e20d909ef59eec6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-16 08:06:30 +01:00
Eike Ziller
a87459c729 Locator: Add progress indicator
Change-Id: I368eeebb8e1878b30f262387cd7a8bcc4d9c9792
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-15 17:47:12 +01:00
Eike Ziller
5e60848942 Utils: Add round progress indicator widget
Change-Id: Ia3a51fb99ae6cec1b7b3c135d272e92d503128dc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-15 17:45:08 +01:00
hjk
bab7794a0d Use TreeModel in plugin dialog
Change-Id: Ifc18e9779b9841a2f08c48dcd8dad36627d6e537
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-15 17:17:53 +01:00
Nikolai Kosjar
273c3fa0af PluginManager: Extract some functions
Change-Id: I1f47f9542729fde338a11180ccaeed3d537a337d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-15 17:05:15 +01:00
hjk
0a9195a1a9 PluginSpec cosmetics
De-noise loops, use QVector for items bigger than a pointer.

Change-Id: Idae68dc51a02cb6df9bdf2d920ae2de99c7bde6c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-15 16:48:35 +01:00
Daniel Teske
27fd8d4eb5 ProjectTree: Fix context menu actions
Opening the context menu would move the focus, which then would
reset the current node/project to come from the DocumentManager.

So move the context menu handling code to the ProjectTree class
and ensure that while it is open, the corresponding ProjectTree
is considered the focused widget.

Task-number: QTCREATORBUG-13684
Change-Id: I8b3dc410f5f5bc5e9a2dd663421b22cf3f147190
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-15 16:06:45 +01:00
hjk
7e522c8a37 TreeModel: Add model pointer to TreeItem
... and use the items themselves as main entry point for
item related operations.

With non-uniform tree items it's easier to have item specific
functionality directly in the item implementation instead of
the model.

Change-Id: I4e9b7db98d16b91ddef81917417691129bb83621
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 16:06:38 +01:00
Christian Kandeler
6bc0b9e5d3 Update qbs submodule.
To HEAD of master branch.

Task-number: QTCREATORBUG-13838
Change-Id: If1f1015e8bc91e3b7ac3c04dcc949b24c5e7e453
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-15 15:48:45 +01:00
hjk
33cb0f36d1 Debugger: Parse LLDB version number in Debugger settings page
This is purely informational, so no need to try overly hard.

Change-Id: I76f25d5c9d9b4e65c10bf66ad1d48e08ab65293c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 15:43:07 +01:00
Robert Loehning
6ad3f3975c Squish: Update menu objects
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 15:17:54 +01:00
Robert Loehning
9d9ec3a91b Squish: Load QmlProjectManager if needed for debugger tests
Change-Id: Iffea74ffa8794b8c496987a4eb22ff76f181f55e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 13:06:40 +01:00
hjk
3b2d2eae17 Debugger: Re-work breakpoint storage handling
The actual data is now in a TreeModel. As interface to
individual breakpoints there's a new Breakpoint class
essentially providing a checked handle.

On the user code side breakHandler()->foo(bpId) is
replaced by bp.foo().

Change-Id: I82f435bad6301fce85a1d82bf6bf39e9ddba511e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 12:19:33 +01:00
Daniel Teske
b88cdef0a3 ProjectTree: Fix signal emissions for nodes that are not yet mapped
The Generic Project Manager builds the tree from the bottom to the
top. Previously no signals were emitted while doing that since
the watchers were added on adding the top level node at the end.

With the new ProjectTree that leads to lots of signals, and leaves
the FlatModel confussed, as that expects the nodes to be already
in the hierarchy and crashes otherwise.

Restore this behavior by checking if the affected nodes are in
the hierarchy.

Change-Id: I832b348867a8abad2afef11297b44f058592cb1d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-15 12:15:48 +01:00
hjk
d573195b67 Debugger: Improve handling of imported system dumpers
At least for a few cases (std::string, vector, ...) this can succeed.

Change-Id: Idfa4ced4cb20295472d001181a83373acd89883a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 11:13:22 +01:00
Robert Loehning
3476546717 Squish: Expect wrong path when adding file
Task-number: QTCREATORBUG-13831
Change-Id: Ide335c00491a50ca8087fa07e27c0191e0d646b6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-15 10:11:48 +01:00
Tobias Hunger
6d7c2eed60 Core: Remove unused functionality to checkout from VCS
Change-Id: I1ee17142e14200c5ae9597bbf9bee3f3978704f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-15 10:10:06 +01:00
Tobias Hunger
fdadddfb7a ResourceEditor: Remove unused member from ResourceFileNode
Change-Id: I98c9fe975a200728dcd32f18706b6bc2e59ca686
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-15 10:09:58 +01:00
Thiago Macieira
33c55923cb Remove old workaround for unsupported Ubuntu.
Ubuntu 7.04 is almost 8 years old now. This workaround can and should be
removed. It was added by fcc9ba4b99.

Change-Id: Ic5d393bfd36e48a193fcffff13b90dc453eb1652
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-14 20:17:37 +01:00
hjk
4b2742e11d Debugger: Macro expander support for debugger version and ABI
Change-Id: Idd920feed7ae402a843a3854a8d2ab83b79b7076
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-14 17:24:05 +01:00
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Robert Loehning
d78b1ba10f Use "Browse..." label from PathChooser
Change-Id: Ie6f91ff1c9ad4cc5092763c2f2eba0da56ce41e6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-14 15:06:52 +01:00
Orgad Shaneh
996406dfcb Core: Extract ExternalToolManager to its own file
ExternalToolManager is exported, while ExternalTool isn't.

Keep them separated.

Change-Id: I9f002ed5ce803bcfc843f13a6858591ed9abcccb
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-14 14:26:37 +01:00
Christian Stenger
d593a276b1 C++: Fix compile for MSVC2010
Change-Id: I3049efa29b80fecc6c9daa9e1eb967428d331bb2
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-14 14:09:57 +01:00
Eike Ziller
c980acc7c8 Locator: Fix help string
Change-Id: I242d180337f7473868e3078095baf2d5e421fa35
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-14 13:54:53 +01:00
Christian Stenger
4f1e9aa485 Squish: Re-enable testing of Pastebin.Ca code pasting
Change-Id: I67f8d9705cd7b5063322e53fb3d745d0314b9fc0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-01-14 13:38:48 +01:00
Nikolai Kosjar
59a604901c CppEditor: Compile fix for MSVC
Change-Id: I07f94584b876a41988f3e9d37c3b6db16738c05f
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-14 13:38:14 +01:00
Nikolai Kosjar
4d3d0e0290 CppTools: Rename EditorDocumentHandle to CppEditorDocumentHandle
...and related functions. For clarity in client code.

Change-Id: Icad6fc7b1eee2ce46a2eba8435359837a23409c8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-14 12:33:15 +01:00
Nikolai Kosjar
845cb2e432 C++: Better names for Scope's iterators
Scope::lastMember() was misleading.

Change-Id: I953d489b8a2a9b86321f73cad3b7b371c4acf91f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-01-14 12:29:37 +01:00
Nikolai Kosjar
d9c70f43d9 CppEditor: Tests: Use QTemporaryDir and avoid writing into creator source tree
This should improve results of CI tests where multiple creator instances
execute the plugin tests.

Change-Id: I557a0964568655662108df201589ba369096f4bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-14 12:10:39 +01:00