Commit Graph

25822 Commits

Author SHA1 Message Date
hjk bfbf9443d6 Variables: Remove some outdated documentation
Change-Id: I63d6c0ec006c586729ec4352b56c1275456a8ad3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-24 18:43:06 +02:00
Nikolai Kosjar b497a34655 CppEditor: Fix always-false-condition
The condition didn't make sense. tk.kind() can't be < T_FIRST_QT_KEYWORD
*and* tk.kind() > T_LAST_KEYWORD at the same time.

Change-Id: Id300ad84f37eeff5081b0389c00d574a9cb23f35
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-24 17:25:13 +02:00
Alessandro Portale 503bd40199 CPaster: Move setting category icon from Core to CPaster
This image is used exclusively in the CPaster plugin,
thus belong into CPaster resources.

Change-Id: If2718c7a58bca389c0afe7ecf32feb251eb0c581
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 17:03:14 +02:00
Orgad Shaneh ae5c0c27bd ProjectExplorer: Fix MSVC compilation
Change-Id: I6062c1e9832bb9f50dd3439724706e1732c73720
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-24 16:56:46 +02:00
Marco Bubke cb2f68d661 QmlDesigner: Fix output slot for the puppet output
Change-Id: I3ee00af335ac8009e420339a650b9532addf189a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 16:47:30 +02:00
Marco Bubke aad1ec1522 QmlDesigner: Fix missing return in NodeInstance::updateTransform
Change-Id: I88158168d83dd3d82006b51b79f34d965f18c718
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 16:47:13 +02:00
Ulf Hermann 34f48ea0c0 QmlProfiler: improve location lookup a bit
It's not a good idea to copy the event location for every single lookup
and there is not point in always reconstructing the label strings,
either.

Change-Id: I2cea8a2a93b31d2c32bd2a27ae1d3b0bd26df6f6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 16:22:13 +02:00
Ulf Hermann 75b5e6fa6b QmlProfiler: Native text rendering for all text elements
Change-Id: Ife322b57479bac885a3dc6a898e6516be6e8e15e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 16:22:08 +02:00
Orgad Shaneh c589b239ff QmlJSEditor: Pass string list by reference
Change-Id: Iab15b11834a6b0339b163a4444d4ef695cae7416
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-24 16:20:14 +02:00
Orgad Shaneh ea4b4bff40 C++: Split designator AST
Change-Id: I9bfed2023624c818c0f35f24476693cffeaf2bbc
Reviewed-by: Wang Hoi <wanghoi@126.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-24 16:16:58 +02:00
Tobias Hunger cb079c5319 Qbs: Use BuildConfig data in Qbs install step
... in favor of qbs::ProductData which is harder to get anyway.

Not worth the trouble just to register the default value.

Change-Id: If597de246028a7eb0859a19b543e9ffe12b31db5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 16:14:54 +02:00
Tobias Hunger c3f8346b9b Qbs: Avoid crash when asking for qbs::ProjectData on invalid Project
Change-Id: I2ce060ab0017eb7722b6dc4f64b1e536f139952c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 16:14:42 +02:00
Tobias Hunger d4c62539fd Qbs: Avoid crash when build changes the project tree
Change-Id: I52fe5bb49f762e8837c5ea825adb20650316ff7b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 16:14:31 +02:00
Tobias Hunger 21cccaa1c9 Qbs: Move updating of files from a project to own method
Change-Id: I88b41ff450dac4e0c2e5a34e3332e559c1919e6e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 16:14:16 +02:00
Thomas Hartmann 53bfe6e0d8 QmlDesigner.ItemLibrary: Adding TabView
Change-Id: I7335f9ce23673ee1215390eb7bb3396fec8e5ebc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-24 16:14:02 +02:00
Anton Kalmykov 496cfdd21d Add syntax highlight for primitive data types
Syntax highlight rules for keywords are changed to highlight control
keywords and primitive data types separately.

Change-Id: Ifb25be7a97b92589030aa190641320c233dc7f2d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-24 15:44:13 +02:00
hjk 2982a763ac Variables: Use lambdas as callbacks to resolve variables
Instead of broadcasting for each resolution we ask the code
that knows about a specific variable directly.

Change-Id: I2f0f4f2acceba85a236995d236980594a3166bd8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-24 15:25:56 +02:00
hjk 000fbe63bc Variables: Show current value of variable in chooser dialog
Helps to determine whether a specific variable is the right one
to use. At least structure can be more easily inferred than from
most available descriptions.

Change-Id: I401603934a99e3d3fe9a26c7cb617b9baa0d502c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-24 15:24:48 +02:00
Ulf Hermann 54b366d7d3 QmlProfiler: replace calls to QVector::length() with QVector::size()
Like that we get a higher chance of staying compatible with Qt < 5.2.

Change-Id: Iecd6e1fbf75bd610917a38a22635a0d8e731738f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:57:25 +02:00
Ulf Hermann b9d349bda5 QmlProfiler: Draw selection boxes only as large as the items
Change-Id: I0f7f4f2a73c24faeff9c502b118e984938a27d25
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:56:54 +02:00
Ulf Hermann 6d5cf83a69 QmlProfiler: Add scaling support to paint events model
Change-Id: I04856628b7498df976d3b7db5539a1125060e9eb
Task-number: QTCREATORBUG-12337
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:56:31 +02:00
Ulf Hermann daf6aa160b QmlProfiler: access the background marks from where they're created
It's considered bad style to access properties of parent objects
defined in a different component as that reduces code reusability.

Change-Id: I0dbe4a3663026d12b2666de75c93841528fe295c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:53:10 +02:00
Ulf Hermann 3dbc59309a QmlProfiler: restore tooltips on category labels
They had been lost somewhere between QtCreator 2.8 and 3.0. Also
putting the location in braces looks nicer than the original.

Change-Id: Ia455ba99015ad38c21e528a0f8177902749ba1d5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:52:57 +02:00
Eike Ziller 84b00721e4 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-06-24 14:52:15 +02:00
Eike Ziller 79bd453feb Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/winrt/winrtruncontrol.cpp
	src/plugins/winrt/winrtruncontrol.h

Change-Id: Idad0558e53e23debee8523586b681af4705e97f6
2014-06-24 14:52:00 +02:00
Ulf Hermann 0d695617f1 QmlProfiler: Add scales to rows in timeline
If you resize the rows to at least double their default size and if the
model specifies a scale it will be drawn as additional horizontal lines
and numbers in the background.

Change-Id: I02844b4102e043031ee04daa45666dc3f8da1d2e
Task-number: QTCREATORBUG-12337
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:50:31 +02:00
Ulf Hermann f30cbf9711 QmlProfiler: allow interactive resizing of rows in timeline
Task-number: QTCREATORBUG-12337
Change-Id: Ib9ddb128605831841023bb3cc9aed758ed171de9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:50:27 +02:00
Ulf Hermann 63ca524069 QmlProfiler: Put height of rows in the timeline into the model
Like that we can provide functionality to interactively resize rows in
the model so that one can zoom in to more interesting parts.

Change-Id: I31f14cd8aa37703240ebec744ca2e77188fb0f27
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 14:50:02 +02:00
Fawzi Mohamed d1cd1a490c ios: correctly replace cryptic Locked message when deploying
Change-Id: I19e33d5c7e35f9d76c81469d3772bc800ce1760b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-06-24 14:19:16 +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 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 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