Commit Graph

5173 Commits

Author SHA1 Message Date
Thomas Hartmann
c51cc28028 QmlDesigner.PropertyEditor: Remove print from .qml
Change-Id: Ifce18301b05e4c05e490ce1b46a2b8e3beab9d40
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-16 17:39:35 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
hjk
1398480f3a Debugger: Limit QByteArray and QString display length
Also add '...' for cut-off std::strings.

Change-Id: Ib6129eb43c723f2a863086a0142312c669b65665
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-16 16:35:38 +02:00
Orgad Shaneh
82aa1380f2 Cleanup whitespace
Mostly trailing whitespace

Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-16 14:27:13 +02:00
Thomas Hartmann
93e37b7e78 QmlDesigner.PropertyEditor: Extend ColorEditor for gradient name
Change-Id: If31e3f313864890d766c6aeaeb0c05687d773a2a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-16 11:15:28 +02:00
Thomas Hartmann
4f62d65174 QmlDesigner.PropertyEditor: fixing regression in ButtonRowButton
Change-Id: I6cc30f93a0a1b966fa6e93dcd149241356e23b9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-15 14:56:26 +02:00
Alessandro Portale
79ed722724 Welcomescreen: Fix opening of help urls
Change-Id: I29a3634ee01317da478d78ec9758b6fc386abbdb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-15 12:45:54 +02:00
Leena Miettinen
6f36614cb5 Welcome: fix link to mobile app tutorial
The tutorial filename was changed.

Task-number: QTCREATORBUG-12247

Change-Id: Ibb2733e41807757c2ce435a0b918eada4da99665
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-15 11:39:26 +02:00
hjk
55c19c5042 Debugger: More flexibility for "ranged expressions"
The range boundary and stride can be integral expressions.
Also ( ) are valid delimiters now, making descriptions like
list.at(2.(4).100+2) acceptable.

Change-Id: Ief68c0a1b0b0d3813b2939d60e0806f5cd3ff0b0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-15 10:12:51 +02:00
Marco Bubke
75fa87eebb QmlDesigner: Fix drag and drop
Task-number: QTCREATORBUG-12227
Change-Id: I02c3bd81ab2b6585d35bab60550788f461e77732
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 11:36:32 +02:00
Sergey Belyashov
2281d7e618 Fixed Russian translation of Welcome screen
Task-number: QTCREATORBUG-12108
Change-Id: I3db4b5ad44666808cf49ea6e0ce226b9972b1beb
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-13 13:47:16 +02:00
hjk
6107fdc276 Debugger: Add "composite" watchers
Multiple expressions can be separated by semicolon,
and arrays allow index ranges given as [a..b] or
with strides [a.(s).b].

Change-Id: I0b7b4ee500a5f6f5027d777b0a1e8ee5a28a7cd5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-13 12:58:35 +02:00
Thomas Hartmann
6aeb2fabc2 QmlDesigner.PropertyEditor: Avoid side effects of ColorButton
The ColorButton did change the color as a side effects of rounding error.
With this patch the ColorButton does onyly change the color as a result
of user interaction.

Task-number: QTCREATORBUG-12202
Change-Id: I6504713a27fe7b562b8342229bd287af23156602
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:31 +02:00
Thomas Hartmann
aff4424f38 QmlDesigner.PropertyEditor: Use ToolTipArea in ButtonRowButton
Change-Id: I462f45dd962f1f136e2cf010b0092457345ec485
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:22 +02:00
Thomas Hartmann
af30fdc916 QmlDesigner.PropertyEditor: Fixing Preferred highlight properties
Task-number: QTCREATORBUG-12216
Change-Id: Ia0452f96c41e7759c6594ecff0fb9e104dae396e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-12 15:10:20 +02:00
Thomas Hartmann
d9727c2816 QmlDesigner.PropertyEditor: Enabling tooltips for labels
The old property editor did support tooltips and many labels
have properly defiend tooltips.
In QtQuick.Controls we have to use private API for tooltips
to show up.

Change-Id: If1c50b58e8388b8846c2dd07fcd326f09d67d127
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:57:15 +02:00
Thomas Hartmann
248964789a QmlDesigner.PropertyEditor: Allow abitrary anchor targets
QTCREATORBUG-12077
Change-Id: Ifce1587235c81da56da6bc5788081cc1711d1bdb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:43:52 +02:00
Thomas Hartmann
d8647b9cc3 QmlDesigner.PropertyEditor: Fix text for CheckBoxes
We need to set the text to the value, so that the user can see which
value is explicitly set.

Task-number: QTCREATORBUG-12195
Change-Id: I0b405839122f3b008790df3e3c2b0b7728299b7a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:42:39 +02:00
Thomas Hartmann
7206c0b020 QmlDesigner.PropertyEditor: Adjusting minimum size for Window
I also fixed the maximum size.

Task-number: QTCREATORBUG-12209
Change-Id: I8a7be267525f8ffd54cb79aecead26edd76c101d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 15:48:33 +02:00
Thomas Hartmann
675a059671 QmlDesigner.PropertyEditor: Using regExp instead of inputMask
This does work as expected.

Task-number: QTCREATORBUG-12018
Change-Id: I1ae4c2f9c222ffcc68a81ab545fe19ac253b0dbb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-05-09 15:35:43 +02:00
Tim Jenssen
1cbea9ce92 QmlDesigner: add reload feature to stateseditor
Change-Id: I61fc9fb05dc901765c1c348cfab29b3d2eaa7516
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-09 11:16:59 +02:00
hjk
5cb7bd51f4 Debugger: Fix Eigen dumpers, again
This time with autotests.

Task-number: QTCREATORBUG-12193
Change-Id: Id91eecd38eb4ac76c68be8e9969651407a68ebf4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-09 08:51:41 +02:00
Marco Bubke
0f55582835 QmlDesigner: Fix wrong order after dropping a item in the navigator
The component complete command is reparenting a item so it is appended. To
get the right order the ChildrenChangedCommand should be sent after
ComponentCompletedCommand.

Change-Id: Id4c1025fc7b4d7f25a7db7511029013c24441dd3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-08 17:42:07 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings
Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:11 +02:00
hjk
f3c56654d5 Debugger: Add dumper for Debugger::Internal::DisassemblerLine
Change-Id: I416dcb4ce95752773839169aaa76d603cbe91bfe
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-07 11:52:24 +02:00
hjk
e260616b2c Debugger: Add dumper for some Qml internal structure
Change-Id: I8e6d48fdaff77228963927e88b95eff136eac92d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-07 11:49:57 +02:00
hjk
ee3d6eba05 Debugger: Call putNumChild from putItemCount
Reduces user side code

Change-Id: I4e6186e4af2b62983e1d14796c88654649fcda21
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-06 17:25:32 +02:00
Orgad Shaneh
41fe19cdc7 QmlPuppet: Remove redundant null validations
Change-Id: I909119533646e0b29724212f764eb2685b683044
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-06 15:41:25 +02:00
hjk
d2ad6aa972 Debugger: Simplify array dumper user code
Heads up: This switches the argument order to allow a default
argument for the inner type if it can be determined from the
base pointer.

Change-Id: I9bf80fcdd51b5db8e7c65adba551ca667912cd86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-06 13:50:25 +02:00
El Mehdi Fekari
7a45450831 Qnx: Properly setup the environment vars in the bar descriptor
The environment variables in the bar descriptor are modified
depending on the Qt deployment option the user selects.

This causes inconsistent behavior if the user modifies those values
on the template file. The env var values will be generated
in the final bar descriptor without being visible on the template
to avoid any user modifications that won't apply correclty.

Note: For next releases, the bar descriptor needs to be handled
properly to avoid any black magic so all modifications should
be visible to the user.

Task-number: QTCREATORBUG-11916
Change-Id: I00a2c855be3def31cd008071c6269e5a69f81536
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-05-02 12:05:55 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00
Thomas Hartmann
5dc3dcc11a QmlDesigner.PropertyEditor: Adding tooltip
Task-number: QTCREATORBUG-12026
Change-Id: I6ea5a6358ea41ae5ada7a5c13337436868902a07
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-29 09:57:02 +02:00
hjk
3f0d02ad7f Debugger: Rework display type selection
The previous index based way was getting too brittle, use enums instead.
Also add a switch between exponential and flat display for floating
point types.

Task-number: QTCREATORBUG-12050
Change-Id: I86addbac5a80e8b79b176c6107b251b466503fe7
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-29 09:18:00 +02:00
Christian Kandeler
c2d20e49dc Support deployment in "plain C" and "plain C++" app wizard.
For qmake, that is. The qbs versions already have deployment support.

Change-Id: I75d9bf0a36285a5e04e0fb7f13fca304d74efdc9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 15:36:07 +02:00
Thomas Hartmann
eb32e5713c QmlDesigner.PropertyEditor: Fixing color chooser
Task-number: QTCREATORBUG-11904
Change-Id: I94d073cae9a162ff2dc6567cb7805ba4df66365f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-25 13:13:30 +02:00
Thomas Hartmann
93f529aea3 QmlDesigner.PropertyEditor: Keep left/right anchors for vertical anchoring
Task-number: QTCREATORBUG-12006
Change-Id: I4926fe462698fb4ae6b8e00bf7f53948a96db79c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-25 11:22:09 +02:00
Takumi ASAKI
63efa8ba45 Fix Japanese translation
Change-Id: Ic9554c1c172360eb413a80c817a62d414e84c265
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-22 15:41:06 +02:00
Marco Bubke
8e455f61b6 QmlDesigner: Fix writing back of unchanged values in GradiantModel
Task-number: QTCREATORBUG-11848
Change-Id: Ia4ad5960dde8573b5b97dd7aabb97c1b418d2a58
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-22 15:39:35 +02:00
Thomas Hartmann
68b1886de8 QmlDesigner.PropertyEditor: Hide TextInput specifics properties for TextEdit
Task-number: QTCREATORBUG-12035
Change-Id: I39fef53ce9203a58ba3ce2a0e09e8b4d69a14fa7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-22 11:21:45 +02:00
Thomas Hartmann
6db907f935 QmlDesigner.PropertyEditor: Adding tooltip to ButtonRowButton
Change-Id: Ia5117b9831d8ccf8c01774a247bc3c68642bc8e4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-22 11:21:28 +02:00
Thomas Hartmann
d01be9da1d QmlDesigner.PropertyEditor: Adjust size of TabView
The size of a TabView does not adjust to its contents.
We have to do this manually.
The minimum size is defined by the LayoutSection.

Task-number: QTCREATORBUG-12040
Change-Id: Icdf42cbc3788b3ce38b9cffdb0dc9afd15d32815
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-22 11:20:22 +02:00
Marco Bubke
edf23211e2 Revert "QmlDesigner: Hotfix for older puppets"
It is a hotfix.

This reverts commit de7d2d7aa3.

Change-Id: Ib0165128183b5811fc548aee3b3a82fba376123c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:02:58 +02:00
Marco Bubke
e9096120ad QmlDesigner: Fix ignored properties for reparenting
We reparented into ignored properties. Now there is a more general mechanism
to prevent this.

Task-number: QTCREATORBUG-11970
Change-Id: Icbd5877dc13c65963079eb3ab67e48bb92056b53
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:02:28 +02:00
Marco Bubke
37b1dc871f QmlDesigner: Merge GraphicalNodeInstance back in QuickItemNodeInstance
Change-Id: I2f5412887a66186d215e56101a63bacfda4f8e0a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:02:06 +02:00
Marco Bubke
c7699c1121 QmlDesigner: Remove QuickWindowNodeInstance
Change-Id: I164b38286a4a4b1ff642c1cfdb8cd19477ad9fa1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:01:42 +02:00
Marco Bubke
a0a36db59b QmlDesigner: Set root NodeInstance as root item in the view
Change-Id: I305bc7bd0c369cd9dfcd68d7d79952c6a669b62c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:01:18 +02:00
Marco Bubke
9818f714f4 QmlDesigner: Use the root NodeInstance for item collection
Change-Id: I0ed67997c371af8acb3db480446ea5d577380804
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:01:02 +02:00
Marco Bubke
3483365f01 QmlDesigner: Add root item getter to ServerNodeInstance
Change-Id: I9f31390b478d8638038998682fb606dea5d1c81a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-16 17:16:03 +02:00
hjk
a0b60bef07 Debugger: Fix variable name in dumper
Change-Id: If32960e22c48ff90b77f06243e7a9c19408d0c34
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-16 09:45:42 +02:00
Eike Ziller
8c1c106a4f Merge remote-tracking branch 'origin/3.1' 2014-04-14 16:53:23 +02:00