Commit Graph

478 Commits

Author SHA1 Message Date
Thomas Hartmann
541b5141f2 QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1
Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-12 11:21:43 +01:00
Marco Bubke
065253a259 QmlDesigner: Ugly hack for the Window bug
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 11:20:04 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Thomas Hartmann
f206d8bae5 QmlDesigner.QmlPuppet: Adding CONFIG += console
This is required for the version check,

Change-Id: I9845260b029e8e01eb71e92c78d40f2a842a5f46
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-01-22 13:44:16 +01:00
Robert Loehning
5292748bf2 Incremented year in copyright info
Change-Id: I6e25ba25aa2898b5382dae7f3751deebb6072efa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-09 09:41:23 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Eike Ziller
e035ae6df1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
2013-12-18 11:02:16 +01:00
Thiago Macieira
9dd60b34f8 Fix use of variable before initialization
That's what you get for shadowing a variable... The "childItem" variable
on the second part of the foreach refers to one declared on the first
part, which is uninitialized.

Found by ICC 14.0:
graphicalnodeinstance.cpp(300): warning #592: variable "childItem" is used before its value is set

Change-Id: I9079a428eda90f4bb06f9ccd1adf836fee119133
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-12-16 21:47:21 +01:00
Friedemann Kleint
6c56a065d9 qmlpuppet: Fix compilation with Qt 4.
Change-Id: I9d6b4044fb4ad59c8fd15e878cc377ca838dfb01
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-16 15:22:37 +01:00
Marco Bubke
07222ba46a QmlDesigner: Refactor enumeration handling
Change-Id: I0e163147a0303741af52127ece6f6afd0d2aa658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-16 12:55:06 +01:00
Marco Bubke
1cfdacc0c3 QmlDesigner: Change version for Qml1Puppet to 2
Change-Id: I599598795fda265030c319f45329e1c67e6f5bfa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-20 14:56:41 +01:00
Marco Bubke
2f040fc6ad QmlDesigner: Change version number of the puppet to 2
Change-Id: I0aafaf76a6d4d6edfd4c3ccc73b702edbbfaa385
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-18 12:42:04 +01:00
Marco Bubke
765242637a QmlDesigner: Fix composite hack in the ObjectNodeInstance
There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-18 12:41:43 +01:00
Tobias Hunger
d8c51d9a2a QmlPuppet: Fix build failure for Qt with versions >=5.0 and <=5.2
QQmlType::isComposite and QQmlType::sourceUrl are both unavailable
when used in objectnodeinstance.cpp

Change-Id: I21f66b00348c0535b4779206bd63e363f4b2c225
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-14 13:12:59 +01:00
Tobias Hunger
82f30716d8 QmlDesigner: fix compare operator in DebugOutputCommand
Change-Id: I69d495cd61585123df99631d92f6c26b114d49b7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-11-13 16:10:48 +01:00
Marco Bubke
b35e8fbf83 QmlDesigner: fix compiler warning GraphicsObjectNodeInstance
Change-Id: I7204914803c4937a050afce2f43232c4b8d67e49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-13 15:33:31 +01:00
Marco Bubke
c9731152ac QmlDesigner: fix compare operator for the TokenCommand
Change-Id: I17ef1a06e94a5a89ffbe3f03103a473b803902f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-13 14:37:47 +01:00
Marco Bubke
0071c80a93 QmlDesigner: Fix non updating of scene matrix if parent transform changed
Task-number: QTCREATORBUG-10644
Change-Id: Ib112352e539fde4eefb8c029080c688bed8a0ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-07 16:35:11 +01:00
Kai Koehne
fe1cf36e1f Remove support for debugging JS with Qt 4.7
Remove infrastructure to debug/inspect QML applications with Qt 4.7.

Change-Id: I277e9884e009475a29017f502bbe1d069317460f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-04 16:32:33 +01:00
Eike Ziller
66c7e8ca16 qmlobserver: fix Info.plist
was missing some end tag

Task-number: QTCREATORBUG-10609
Change-Id: Id2e009c29489649c54ad3c7916024b9e485651ed
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 12:20:36 +01:00
Thomas Hartmann
262a1e262d QmlDesigner.Qml2Puppet: fixes for composite types
Composites types need their own code path.

Change-Id: Ia1b14bf4f8519f786c08b94f168ec369d79defc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-29 14:30:05 +01:00
Marco Bubke
a2c0b91ec5 QmlDesigner: Disable componentComplete for primitive creation
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 09:48:04 +02:00
Christian Kandeler
bdc26d9379 Do not set the QT_CREATOR macro for the QML puppet.
It's not Qt Creator. And otherwise the build breaks with a namespaced
Qt.

Change-Id: Ib30ef86fbc59a02f6fd60d2f0b0b8f4ab452ef6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 16:55:37 +02:00
Christian Kandeler
0ee5389017 Remove support for Madde-based platforms.
With Nokia's decision to stop support for Harmattan applications
in their app store, the last remains of a use case have disappeared.

Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-15 10:27:28 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
Marco Bubke
5f61d91648 QmlDesigner: Fix movement of items
Change-Id: I22440c949f634b60ec90803aa6b61bbcf819ea48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-30 13:53:26 +02:00
Jens Bache-Wiig
cf56178df1 Port welcome screen to Qt Quick 2
This ports the welcome screen to use QtQuick 2.0.
I have disabled the plugin on Qt4 builds.

Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-16 13:31:59 +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
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
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
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
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
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
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
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
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00