Commit Graph

36427 Commits

Author SHA1 Message Date
Thomas Hartmann
1fd6a4a80a QmlDesigner.PropertyEditor: Fix GeometrySection
This fixes a regression introduced by
commit 1da0d018c2.

Task-number: QTCREATORBUG-12501
Change-Id: I96dd1c19afa6b6b0a56ef5f6ea5e01272aa1b774
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 12:29:46 +02:00
Orgad Shaneh
f3106ebafe Git: Use a separate thread for updating commit data
Task-number: QTCREATORBUG-12449
Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 12:00:22 +02:00
Orgad Shaneh
aaa7cd5851 Git: Fix sha1 resolving when a branch is added from detached HEAD
Change-Id: I0d8ad988411256fc284b84f78be6f54362ab19ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 11:25:10 +02:00
Eike Ziller
8fc7035b18 Help: Open example documentation in extra window
Also remove the hack that HelpManager::handleHelpRequest looks
for ?view=split in the URL and use an enum instead.

Change-Id: I4ad74775381cf0b321181358266d8e89c6e277b5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-24 11:22:20 +02:00
Thomas Epting
513aba55a2 QbsProjectManager: Added functionality to remove files from projects
Change-Id: I3371e14b5fbf2eaaacc833b289f945aed57cc80e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 11:22:20 +02:00
Orgad Shaneh
c297510d93 Git: Remove diff editor
Not used anymore

Change-Id: Ie1c79583938e24c3bad8acad7acc2f0574234450
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 11:20:59 +02:00
Orgad Shaneh
d6583f0f47 Git: Add on-demand branches expanding
Make "branches expanding" on demand and asynchronous.
After "git show" there is clickable text: "Branches: <Expand>" in
description. If user clicks this text then branches for commit is
triggered and done asynchronously.

Task-number: QTCREATORBUG-11293
Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 11:19:28 +02:00
hjk
281aa9e0d6 Debugger: Add personaltypes.py as default location for local additions
Change-Id: Ib393258970f04f2e829f959adedfbc588a966a10
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-24 09:41:16 +02:00
Orgad Shaneh
4f24d035ba Utils: Add QtConcurrentTools header to project
Change-Id: I977b3df9b7111e1f8949abc09975c5bbc4a8e768
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-24 08:58:05 +02:00
hjk
fc46406fc8 Debugger: Allow loading dumpers from a file directly
Instead of requiring the user to add the required python
code to load them manually let him specify a file directly.
This also makes the feature accessible to LLDB which needs
a slightly different syntax.

Task-number: QTCREATORBUG-12492
Change-Id: I12621b1cea2429476b0865bcbcb739a238dcf6af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-24 08:48:15 +02:00
Marco Bubke
a83548f189 QmlDesigner: Direct update of the position
This is maybe harmful shortcut in 99.99% of the cases it should work
better.

Change-Id: Ia162666862498ac331c9f5381cb12753d34758c1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:24:07 +02:00
Marco Bubke
8dfb05c846 QmlDesigner: Use QQuickWidget in the item library
Change-Id: I8297b513722fb5fc51fedadfd5f93e3198800ada
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:25 +02:00
Marco Bubke
eb5edae8eb QmlDesigner: Using QQuickWidget in the Property Editor
Change-Id: Ib0bd01a2698e6d8483704de1f8a165696f25ec5e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:16 +02:00
Marco Bubke
7d43664958 QmlDesigner: Use QQuickWidget in states editor
Change-Id: Ic2f5b75eb470687b4985d61a38a8346d7947a4eb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:11 +02:00
Marco Bubke
435de83892 QmlDesigner: Cleanup item library
Change-Id: I863ae9a3e84ee6af7be56fa8ebf5a350f8e2db34
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:07 +02:00
Marco Bubke
826525f89f QmlDesigner: Add item library section visibility
Search is working again

Change-Id: Ie6d52f476e2b9b5c3256bc289bcdd5dcadafea93
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:02 +02:00
Marco Bubke
c77f533ddd QmlDesigner: Remove visibilityChanged
Change-Id: Ica52f8a9837eb1b041c890181beda839f3b99a4f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:22:59 +02:00
Marco Bubke
adeb2e6a29 QmlDesigner: Fix section visibility
Change-Id: Ic663e7f8aa8916bb7531c1a2da05e6b2b45bfcb9
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:22:55 +02:00
Marco Bubke
44685b535d QmlDesigner: Promote visibility changes of item library items
Change-Id: Ie4b70a2785fbd9199a81ffaf879f521431aa609d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:22:48 +02:00
Thomas Hartmann
ca8ecce151 QmlDesigner.PropertyEditor: Adding TabViewSpecifics
Change-Id: I4160946d46e7731809f5fbdadf47bd1e5dde38ef
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-23 19:18:31 +02:00
Thomas Hartmann
becfaf3d2d Fix msvc2012 compilation
Change-Id: I533f720e83880d57e2f319b8c07b58c175dd2e84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 16:59:20 +02:00
Marco Bubke
44d1b9f35f QmlDesigner: Change name to itemVisible
Change-Id: I9eb034292f79da8d3060f7f4a917a9e2c11eeb83
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:42:53 +02:00
Orgad Shaneh
cec401d8e5 Doc: Rename some images from "targets" to "kits"
Change-Id: Ibb5475e15c7f2fa845e8060cf176296693769766
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-23 16:35:47 +02:00
Orgad Shaneh
6c921090bf DiffEditor: Avoid "jump to file" for directories and nonexistent files
Submodule diff sample (sub is the submodule's root directory):

diff --git a/sub b/sub
index 6ae5025..4b26500 160000
--- a/sub
+++ b/sub
@@ -1 +1 @@
-Subproject commit 6ae5025c9a66767e90cd320f9661e7694f7ea8b5
+Subproject commit 4b2650066d4143e8b7a9f4b19e46b96996a1dd90

Change-Id: I388de5bc50ceb1fcfc31a3a70ce8328c83fafa71
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-06-23 16:35:41 +02:00
Marco Bubke
ed8677b391 QmlDesigner: Always show all items in section model
Change-Id: Iad0ee5e39553c9cb778bfd5673378af84063f4af
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:13:00 +02:00
Marco Bubke
ed03cfecf6 QmlDesigner: Add visible property to ItemLibraryItem
Change-Id: I22cd7d587f030343cbf71c62357b9752650e4711
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:12:57 +02:00
Marco Bubke
c4461a83ba QmlDesigner: Add visible to section
Change-Id: I7d4e3ef3fe843d28336c306afa6de0e3450eb733
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:12:54 +02:00
Marco Bubke
a8fef93036 QmlDesigner: Remove sectionVisibilityChanged
Change-Id: I5d9840fcfa5be4ea783cfa3d412637c98bbb68c0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:12:51 +02:00
Marco Bubke
b235ef374d QmlDesigner: Remove ItemLibraryModel::m_sections
Change-Id: I884af24b8e36a81a7f11b2587d84f7f33ff948c3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:12:47 +02:00
Marco Bubke
de011703e1 QmlDesigner: Fix default value of ItemLibraryItem::m_isVisible
Change-Id: I5228af65756e457bb08719599354f10f9cf772cd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:12:43 +02:00
Marco Bubke
bfe474b4ba QmlDesigner: Change ItemLibrarySectionModel to list
Change-Id: I04932ff50e0e4f8a1eda72df35e9ba675ae2709e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:06:11 +02:00
Marco Bubke
c4a47e091d QmlDesigner: Remove ItemLibraryModel::m_itemInfos
Change-Id: Ie4d91fb6f433684d273317e1b2191474f70f156b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:06:01 +02:00
Marco Bubke
6c5a17c271 QmlDesigner: Remove itemLibId in ItemLibraryItem
Change-Id: I0b7fc69b405f59b5f20fb453556eab0a1881f9eb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 16:05:52 +02:00
Orgad Shaneh
4494e74ae7 QmlDesigner: Fix "unused argument" compiler warnings
Change-Id: Ibfdd61069183a80b322674376200d92d11c06a41
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-23 15:30:18 +02:00
Orgad Shaneh
37767bc233 Qnx: Fix version comparison
Change-Id: I6f55252bc777bb0dd64698982e62c873c5b9e663
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:30:03 +02:00
Orgad Shaneh
a6d8bbbb14 VCS: Discard commit if submit widget is disabled
Change-Id: I8f11f56565f46919e93a30f754465de3bc44437e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:29:55 +02:00
Christian Kandeler
bbdd0655bc QbsProjectManager: Fix signal/slot connection in QbsProjectParser.
Change-Id: I6f56dc7bb17cd1bbf9dd56763937d878fce0dda8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:13:31 +02:00
Christian Kandeler
8327171002 Update qbs submodule.
To HEAD of master branch. Also adapt QbsProjectManager to API changes.

Change-Id: I22eb0c0966685fc26a3c6c143fd3d2d5cb4fab8d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:12:34 +02:00
Tobias Hunger
71df641046 TaskHandler: Add task handler that let's you jump into the configuration
... wire it up so that "No compiler found in kit" gets you to the kits
page.

Change-Id: Ie7b34d285a6d2eef81ccd5fdc86d91bcd0254515
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-23 15:04:16 +02:00
Tobias Hunger
4eb2908c44 Unify "missing compiler" and "missing build configuration" tasks
Everybody used to do their own thing...

Also unify the "Configuration is faulty" message we write into the
Application output window.

Change-Id: I0e5c4ec68155d66aa1d0ea53134b98917869e5c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:04:04 +02:00
Tobias Hunger
43735f28dd Core: Add method to get the tooltip for the showOptionsDialog
Change-Id: Icf473145f615f8ea80887f9620ca95af812d0c98
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-23 14:58:59 +02:00
Thomas Hartmann
4f5f56c810 QmlDesigner.ContextMenu: Fix regression
We have to create a local SelectionContext for the target node.

Change-Id: I69a490fbc154d5cc15d9ea4f40899afdbab77a7c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-23 14:33:11 +02:00
Thomas Hartmann
7894bd6acb QmlDesigner.TabViewSupport: Add EnterTabDesignerAction
Change-Id: I381df57461ab3e45e477dc34674e78161342432b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-23 14:32:20 +02:00
Thomas Hartmann
6f51d76cd4 WelcomePage: Taking text sizes into account for layout
Buttons do not have a fixed width of 160px anymore
and the sidebar layout becomes dynamic.

Task-number: QTCREATORBUG-12108
Task-number: QTCREATORBUG-12091
Change-Id: I940b4b7c9c79a312766501559147abb85833b78f
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-23 14:30:47 +02:00
Marco Bubke
cc68534e06 QmlDesigner: More quadratic size of item library delegates
Change-Id: Ie16f486fbe873fbec6663ac965e244c59c0e0e6b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 14:10:33 +02:00
Friedemann Kleint
3c13f9484f Gerrit: Display dependent changes as tree.
Add a depth member to GerritChange indicating the tree depth
and populate it by searches over the dependent changes.
Display the root changes sorted by date and add dependent changes
to their deph=1 parent, avoiding deeply nested items.

Change-Id: I66ccf392ce47514841c661820797e81996e9e5cc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-23 13:58:14 +02:00
Orgad Shaneh
49b0b5d3eb Gerrit: Use magic branch options to specify reviewers
Enables specifying reviewers over http[s].

Supported since gerrit 2.6 (specifying reviewers will be broken for
earlier versions).

Prepare for supporting other options (draft, publish, topic...)

Change-Id: Id0b6508409123cddb9dec5ea9e78d7a6a1423057
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-06-23 13:55:12 +02:00
Lorenz Haas
caef827cd7 Beautifier: Harmonize setting's translatable strings
Change-Id: I9b0a4b305415e1f97353bd4ebc2631634cebd1cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-23 13:08:08 +02:00
Lorenz Haas
fef167b96d CppEditor: Allow single "m" prefix for GenerateGetterSetter
Task-number: QTCREATORBUG-12244
Change-Id: Iab666f003df04da97ed7f4aa47f9b979e319e9a4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-23 13:07:17 +02:00
Lorenz Haas
386eca649d CppEditor: Fix handling of "m_" in GenerateGetterSetter
If a variable's name is only "m_" it should not be recognized as a
prefix (resulting in an invalid/empty getter and meaningless setter) but
rather as a name with the "_" postfix. This way, it results in getM()
and setM().

Change-Id: I9a8249fc12319034b95532415f40b6c3183f7754
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-23 13:06:49 +02:00