Commit Graph

2828 Commits

Author SHA1 Message Date
Tobias Hunger
0669547081 Dumper: Fix QImage dumper on 64bit machines
Change-Id: I8e38ce8ace7bd11d60f90c8b4c392364da65ae59
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-11 15:14:49 +02:00
Marco Bubke
8336a1b7ec QmlDesigner: Remove qDebugs
Change-Id: Iab635145cb2cde87c8d229983e1436910e90f0e4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-11 12:40:42 +02:00
Marco Bubke
bd9cf4bc87 QmlDesigner: Don't move items in a layout
Change-Id: I9050b11d50d39726e2a19cabb7709020738a5c95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-11 12:40:36 +02:00
Marco Bubke
820223a8f5 QmlDesigner: Re factor inline methods in NodeInstanceMetaObject
Change-Id: I9130b166a077fd0add21b65cab8fa7eee829386d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-11 12:40:22 +02:00
Marco Bubke
2507a24ba9 QmlDesigner: Use QQuickView::setContent to set root component
Change-Id: I8d5700c71fd4e46f0463bf02195506251f71a853
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-11 12:40:11 +02:00
Marco Bubke
a25f30d6c4 QmlDesigner: Remove unneeded QtQuick import
Change-Id: Iab41ff8f1c197238c3cf78c6f99d78ee349b2137
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-11 12:39:59 +02:00
hjk
c68e90ec5c QmlPuppet: save a few function calls
Change-Id: Ic73b8bb417c2bf40af6146fe781c206266d3ecf8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-11 10:49:54 +02:00
Marco Bubke
b00a7f0311 QmlDesigner: Fix attached properties call
Accessible.role for example was not found.

Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-10 16:03:52 +02:00
David Kaspar
3c94b88cef Qnx: polishing bar-descriptor.xml files in Qt5 wizard templates
Change-Id: Ib943bdbfd6ebc7c9dfcbe5fd4995df86a3b73ff7
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 08:41:24 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
2013-09-06 12:20:44 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +02:00
Thomas Hartmann
732d5ec701 QmlDesigner.QmlPuppet: fix for clipping in sub items
We did not clip sub items if clipping was enabled.

Task-number: QTCREATORBUG-9604
Change-Id: I75fdabd86193fbfbf397bf3d119a1a33c72cf771
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:22:11 +02:00
Thomas Hartmann
61e7641a6d QmlDesigner.QmlPuppet: fix for nonInstanceChildIsDirty()
We did not take care of the case where only the transform of a child
changes but nothing else.

Task-number: QTCREATORBUG-9796
Change-Id: Id997e527193c103abf3aeb77826501fb8f701fb7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:19:22 +02:00
Thomas Hartmann
cb0e37128b QmlDesigner.QmlPuppet: fix for bindings and alias properties
For alias properties a binding to the original property
was not properly enabled.
This means that if bindings were reseted the original value from the binding
was overwriting any change to this property.

Solution: We disable the binding of the alias property manually using the
hash from resetBinding().

Task-number: QTCREATORBUG-9582
Change-Id: I7a891bbdd06154de8a4e1ff2d3c0939d4e8b4010
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:11:54 +02:00
Oswald Buddenhagen
4855871607 Merge remote-tracking branch 'origin/2.8' 2013-08-27 10:48:08 +02:00
hjk
938151a0d7 Debugger: Enable pretty-printing of FORTRAN character*n types
Change-Id: I46602fe6691471427d9f95925e8f88e99ab962f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 22:41:39 +02:00
Thiago Macieira
62fb22278c Debugger: Add dumper support for IPv6 in QHostAddress
Change-Id: Ia542cf9e3c695a2c3c4b6340c3d72dfe743339c6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-08-23 21:36:39 +02:00
Guillaume Belz
3d9f8f7df7 update french translation
Change-Id: If70d24c1ffca3695bed1495cc697a12043152298
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
2013-08-23 15:25:42 +02:00
Marco Bubke
7be0100298 QmlDesigner: V8 is not anymore present in 5.2
Change-Id: Ie154a02719f4706b9edc872767b137fe6f9977bc
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-22 12:27:07 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
2013-08-21 14:39:18 +02:00
Tobias Hunger
ee47b652a6 Snippets: Allow lowercase/titlecase/uppercase modifiers for variables
Use the same syntax already used in the custom wizard to denote
variables that are modified to be lower-/title-/uppercase:

 $tESt:u$ will become TEST
 $tESt:c$ will become TESt
 $tESt:l$ will become test

The snippet will be inserted without any name mangling happening.
Once the editing is done the name mangling is applied to all fields.

Change-Id: I7c1f5a1ad2bb5acf1b88b54de51bb39391c64763
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-20 14:49:17 +02:00
Sergey Belyashov
1b2675f7d6 Russian translation update
Change-Id: I10354aa8b9bdede194d0046bd61501301d2c9863
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-19 11:25:10 +02:00
hjk
8ae41de20c Debugger: Fix dumpers in the presence of -D_GLIBCXX_DEBUG
This affects std::map, std::set and their iterators.

Change-Id: I372833d04a1f96afd38f127c67052c69cbb3dc02
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-16 16:41:19 +02:00
Pavel Fric
e1b63dd526 Update Czech translation
Change-Id: I65f14acf749ea055d07a65c8900461acac3ba8ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-16 16:16:40 +02:00
hjk
958a1d2d4e Debugger: Implement dumper for std::unordered_{set,map}
Task-number: QTCREATORBUG-9855

Change-Id: I985745530d93e1c191442431a7a9449a1c4c059a
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-16 11:11:21 +02:00
hjk
cb4c649ac0 Debugger: Improve caching of unnamed structures
Task-number: QTCREATORBUG-9947

Cherry-picked from 16c4c2ae64

Change-Id: I901bb87ecafc4c1260003de51678ab66122aaffa
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-16 11:11:21 +02:00
Marco Bubke
04f29127a1 QmlDesigner: Fix transformation bug for tab widgets
Change-Id: Idc33ddf04f0b6fc317aeb5ed72fd7164ba174ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-15 15:51:02 +02:00
hjk
16c4c2ae64 Debugger: Improve caching of unnamed structures
Task-number: QTCREATORBUG-9947
Change-Id: I701bb87ecafc4c1260003de51678ab66122aaffa
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 15:42:14 +02:00
hjk
e2aa5b53cf Debugger: Add dumper for QIPv6Address and Q_IPV6ADDR
Change-Id: I85d8a484fdc3a265aa736d6a2f38ff955af8e138
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-12 12:41:57 +02:00
Nikolai Kosjar
92afe048ef Debugger: Fix PPToken dumper
Done-by: hjk <qthjk@ovi.com>

Change-Id: Iaccb29d4c74922337ada05971bb392a1458c94ef
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-07 16:23:08 +02:00
hjk
6e4aa21aee Debugger: Add a dumper for KDSoapValues
Change-Id: I2537e02e0fa5e5d41c5d0dbd82389d4a2edfd39f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-02 12:09:33 +02:00
hjk
f990d119db Debugger: Add dumper for CPlusPlus::StringLiteral
Change-Id: I3221374625bacdab4d7d780524250b082bea5f0c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-02 10:59:09 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:37:29 +02:00
Christian Kandeler
824c6a5c56 QbsProjectManager: Support the "plain C" and "plain C++" wizards.
Change-Id: Idcc8459660526f972949a6f6908acc19bd52a4f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:39:29 +02:00
Christian Kandeler
1f007a6264 Consolidate the different "Plain C/C++" wizards somewhat.
We should not duplicate all wizard resources for every supported
build system -- this will not scale. Instead, have one top-level
directory for each type of wizard with build system specific data
in respective subdirectories and common data in another.
To support this approach, CustomWizard now traverses the template
directory recursively as long as no wizard specification has been found.

Change-Id: I8aad8cf36c5bf24d062f2d2c17fdb87ad12fd450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-26 16:14:06 +02:00
Christian Kandeler
080277e8ae Do not offer CMake-specific wizards if that plugin is not enabled.
Rationale:
    a) For people not interested in CMake, the wizards unnecessarily
clutter the UI. If unhandled, this problem would get worse the more
build systems we support.
    b) If such a wizard is actually used in the absence of the plugin,
nothing visible will happen after it has finished, which is guaranteed
to confuse users.

Change-Id: I070409d3185b11d2e04e33927a97843e60c657ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-26 15:14:02 +02:00
Marco Bubke
44bbfa3bc4 QmlDesigner: Better argument checking for the qml2puppet
Change-Id: Ib4c83d9bb30705c23b9966696ebc7015501da154
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-24 14:19:42 +02:00
Simon Hausmann
c97e894a24 Fix build with Qt dev (5.2)
QVariant now has an operator< that is ambiguous with this one.
(since commit 7ed15da3c1b9e2bb26f414a10bfc6e6d79d7cc7b in qtbase)

Change-Id: Idf38afe85cec966df1885aa2da0f37fbb3eeccf6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-18 14:40:03 +02:00
Eike Ziller
5563604876 Merge remote-tracking branch 'origin/2.8' into HEAD 2013-07-18 11:54:02 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 11:11:25 +02:00
Marco Bubke
0ba2b9b37d QmlDesigner: Add qdebugs for commands
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 17:04:31 +02:00
Marco Bubke
8f22b84016 QmlDesigner: Fix the exit for qml puppet
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 17:00:31 +02:00
Sergio Martins
01252c53df Remove semicolon from Q_PROPERTY snipplet.
Change-Id: I3e5ae3eb17701c7c0dceca53011ab9998449f531
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 13:57:30 +02:00
Thomas Hartmann
f45a01b203 QmlDesigner.PropertyEditor: fixes in ComoBox.qml
Change-Id: I409cd74c90e55006b05eb8cd71fbbfa59811fa29
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:38:22 +02:00
Thomas Hartmann
ba084e663f QmlDesigner.PropertyEditor: enabling layout direction
This has been fixed in the rewriter and meta info system.

Change-Id: I4c78a915a05c01b33f779cf255c5b9c67d3e0001
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:29:10 +02:00
Thomas Hartmann
42b4e57f55 QmlDesigner.Qml2Puppet: crash fix
If if have less then one argument show some help end exit.
The code afterwards assumes that we have at least one argument.

Change-Id: I555e02dc03c2319eef713b880cf43d740d64e942
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 15:19:32 +02:00
jkobus
68f860356e Update Polish translations
Change-Id: Ide7ddf7b1ef7c89224b02a710e84f64cb02a1c15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-14 16:05:28 +02:00
hjk
108085008f Debugger: Fix QUrl dumper for Qt 4
Change-Id: I3a162bd7b8f181b8f337194004baee065b1c96ac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 14:40:57 +02:00
hjk
5718a88717 Debugger: Remove some boiler plate in dumpers
Use Dumper.putPlainChildren where appropriate.

Change-Id: I7fc26e3b04cd67d07b2d4c7b84d5c6a8dcd6c001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-12 14:15:58 +02:00
Eike Ziller
ab0c3da08f Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
2013-07-11 08:02:41 +02:00