Commit Graph

41089 Commits

Author SHA1 Message Date
Thomas Hartmann
43d716bb5a QmlPuppet: Remove private dependencies from QmlTransitionNodeInstance
Change-Id: I8a5144947469a3c7f368fa6b18781c0d07b4d850
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:17 +00:00
Thomas Hartmann
d38b1c21a2 QmlPuppet: DesignerSupport is not used directly anymore
No need to use DesignerSupport directly in ObjectNodeInstance.

Change-Id: I124adc6334feb23c30fb1a242fe95386678eadf5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:12 +00:00
Thomas Hartmann
f86eb9b78c QmlPuppet: Move functions from QuickItemNodeInstance to QmlPrivateGate
No need to use private API in QuickItemNodeInstance.

Change-Id: I5450ea41571c2787081cc88f59494a28eea5546c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:05 +00:00
Thomas Hartmann
e1a19ba229 QmlPuppet: Removing private headers from ObjectNodeInstance
Change-Id: I179de2b759307a9251c672b1747823626e2f3ef0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:00 +00:00
Thomas Hartmann
a1f70b965a QmlPuppet: Adding objectWasDeleted to QmlPrivateGate
Change-Id: I5dadc879f0c6a02ca29c35fff1847b3c7b0a0972
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:53 +00:00
Thomas Hartmann
f3abe73956 QmlPuppet: Adding keepBindingFromGettingDeleted to QmlPrivateGate
Change-Id: I51d0d29939b6fbd3fc309c092654f373abd8f179
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:48 +00:00
Thomas Hartmann
c6047e06e6 QmlPuppet: Move setPropertyBinding() to QmlPrivateGate
We cannot keep the context.
The context has to be forwarded each time.

Change-Id: I50b944bea1c6ad30832490edad8b35f392c32029
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:44 +00:00
Thomas Hartmann
ebf074a604 QmlPuppet: Coding style
Change-Id: I9e7d54a3b6e4de452dc2cee1101100631cd69cbb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:37 +00:00
Thomas Hartmann
d06980f9bb QmlPuppet: Move doComponentCompleteRecursive to QmlPrivateGate
Change-Id: Ib6ccf791e1dd74878e04c8248bed371fb08084cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:28 +00:00
Alessandro Portale
2659344873 Qt Quick Application wizards: Use the proper icon
Change-Id: I044a6fa2098bcd15ad2d63b3504a5d850d8a980c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-20 14:00:50 +00:00
Alessandro Portale
9df3d850a1 Qt Quick Control Application: Optional QtWidget dependency
Let the user chose whether "native styling" via QWidgets/QApplication
should be enabled or not.

Change-Id: I5eaa7b3a94d5361e62ebce61ff6b7b9216e15b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-20 14:00:44 +00:00
hjk
1d31955abc ProjectExplorer: Remove IRunConfigurationAspect::addToMain*Widget base
Not needed in the current use cases. The original plan was to
use a loop in the *RunConfigurationWidgets constructors, making
them less dependent on the actual RunConfiguration they serve
(and potentially have a one or few generic RunConfigurationWidget).

Change-Id: I2209213414248a1e13b50447f05e8f189620a6f1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 13:26:39 +00:00
Nikolai Kosjar
89f37e30fd QMakeProjectManager: Remove unused member
Change-Id: I30ae181a3d8c36fd0c0f5c1c0d399fb3fbcd3db4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 13:09:58 +00:00
Thomas Hartmann
a54bdf3dc7 QmlPuppet: Introduce DesignerCustomObjectData
This class holds the additional data we use to annotate QObject.
At the moment we store the default values and bindings there.
I also moved the code to populate and read the hashes
into that class.

Change-Id: Ib5e4b5291cfd2bf5555a896bf42578d07f2c6253
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 12:49:40 +00:00
BogDan Vatra
7b0ae1ad0a Android 5.1 is not unknown anymore
Change-Id: Ic4b1b8d6de95a30f5542ea618ef728e64c4f7bc7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 12:27:52 +00:00
Orgad Shaneh
81721f6781 C++: Fix resolving of recursive typedef
Use-case:
template<typename _Tp>
struct Temp { typedef _Tp value_type; };

struct Foo { int bar; };

void func()
{
    Temp<Temp<Foo> >::value_type::value_type *p;
    p->bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14237
Change-Id: Ie0b21b81526d610437ed2d2877083bb929c25047
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 11:14:20 +00:00
Orgad Shaneh
cbc122e2e2 C++: Introduce CreateBindings::Ptr
typedef for QSharedPointer<CreateBindings>

Change-Id: Idf7a9984bb90da82407abd4b7dec9f40926beac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 10:51:12 +00:00
Orgad Shaneh
de68ac5407 C++: fix code completion for decltyped type
example:
struct Foo { int bar; };
Foo foo() { return Foo; }
typedef decltype(foo()) TypedefedFooWithDecltype;
void fun()
{
  decltype(foo()) decltypeFoo;
  decltypeFoo.;// code completion should work here

  TypedefedFooWithDecltype typedefedFooWithDecltype;
  typedefedFooWithDecltype.;// code completion should work here
}

Started-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Task-number: QTCREATORBUG-14483
Change-Id: I296ceed9d896c68cf0651265afb08a1fc42f9a68
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 10:45:31 +00:00
Tobias Hunger
57e3714db4 JsonWizard: Remove member that is only ever read
Change-Id: I87529de8fb600dfc08862143f708e445bc18ed47
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-20 09:03:51 +00:00
Nikita Baryshnikov
ba3ed06443 Revert qbs submodule
Change-Id: I8f838b5c9cdc248801be3d204622d028d181757a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-20 08:47:58 +00:00
Thomas Hartmann
4d4320d598 QmlPuppet: Move hasFullImplementedListInterface to QmlPrivateGate
Change-Id: I42a744b67811cc49b616b742da46af5502d5e1a9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 08:39:59 +00:00
Lukas Holecek
a439335500 FakeVim: Disable visual navigation for text cursor
Change-Id: I04a05ae034dbe5e891df5e39275ce0430eabb649
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-20 07:58:27 +00:00
Nikolai Kosjar
04a03106ce ProjectExplorer: Compile fix
Change-Id: Ia820f95a54175b1bb15014fd828ac6e722c6e037
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 02:26:25 +00:00
Nikolai Kosjar
25c63444af CppTools: Remove QTC_ASSERT in completeQtMethodClassName
SOFT ASSERT: "klass" in file src/plugins/cpptools/
cppcompletionassist.cpp, line 1916

...can occur during Qt5 signal/slot completion if the object type can't
be looked up, e.g.:

    Foo *foo; // Foo is used by not defined
    connect(foo, &<TRIGGER COMPLETION HERE>

Change-Id: I0fafd328635e1db57d700d531af0fee819cca8fa
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-19 15:02:09 +00:00
Orgad Shaneh
237cfd1f77 Dumper: Add a dumper for CPlusPlus::Class
Change-Id: I619d31f307844349095c81defc675c57fcaa4de0
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-19 14:53:53 +00:00
hjk
589b76041e QmlPuppet: Compile fix for namespaced Qt
Change-Id: I53042de1fdc639e63068ce1f8cdd6e1c81151264
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-19 14:09:46 +00:00
Tobias Hunger
78630de9e5 QMakeProjectManager: Denoise code
Use "using Core;" instead of prefixing Core:: all over the place.

Change-Id: I00b50da731bf2b4bf442c587566d11a3ef921834
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-19 14:02:17 +00:00
hjk
85a6b37702 QtSupport: Use ArgumentsAspect in CustomExecutableRunConfiguration
Change-Id: I739d41d917cd72f7be093ceb5200b8c947d09f4a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-19 13:51:39 +00:00
Thomas Hartmann
c53d36cd8c QmlPuppet: Remove unused function
Change-Id: Ie8c3adbb1ce3639a8627bad763697b295b542e8f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-19 12:53:09 +00:00
Thomas Hartmann
c9b8bbc5ad QmlPuppet: Remove unused forward declaration
Change-Id: I5316877702cd120704a56c7a0015a7643d4f7856
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-19 12:52:52 +00:00
Thomas Hartmann
37bfa979b3 QmlPuppet: Remove unused m_modelAbstractPropertyHash
Change-Id: Ie032e51a856b0081c63b715a6324d9638820c1ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:45:49 +00:00
Ulf Hermann
aa1b52aec9 Timeline: Use QSGSimpleRectNode for testing render state
Apparently on some Qt versions we cannot add geometry nodes without
material to the tree.

Change-Id: Id6d7debefd2060190f101ab365f27cae2f461d8d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-19 12:38:56 +00:00
Thomas Hartmann
a02438a44f QmlPuppet: Move fixResourcePaths to QmlPrivateGate
Change-Id: I9bbd22c19df64d3cfda3bbf02d9c72da5c2a0542
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:26:07 +00:00
Thomas Hartmann
c4489a19b4 QmlPuppet: Move ComponentCompleteDisabler into QmlPrivateGate
Change-Id: I71aba092fde0e8026b69a463892b2421c69fb514
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:26:01 +00:00
Thomas Hartmann
beec481241 QmlPuppet: Fix warnings
Change-Id: I6bf708fbb0ad3c48dc286c78d25875e155e9d551
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:25:56 +00:00
Thomas Hartmann
685cdfc0bf QmlPuppet: Move createComponent to QmlPrivateGate
Change-Id: I86800d876cb821412b2708201e3c6983a996e4a9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:25:46 +00:00
Thomas Hartmann
d2e58eeeec QmlPuppet: move allPropertyNames() to QmlPrivateGate
This patch also fixes a memory leak.
The inspectedObjects in the default case were never deleted.
We now use a pointer to an object on the stack instead.

Change-Id: I07490e26b956e6c04911cb3e5e051704b2c2c35d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:24:03 +00:00
Thomas Hartmann
868c8e3fe7 QmlPuppet: Move createPrimitive() to QmlPrivateGate
Change-Id: Ia635d3c0c4f00c90955f29b487a9d18911488908
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:23:57 +00:00
Thomas Hartmann
e0a3e25491 Qml2Puppet: Introduce QmlPrivateGate
The goal is to avoid direct usage of private API.
Any access to private QML API is supposed to go through QmlPrivateGate.

NodeInstanceMetaObject is moved into QmlPrivateGate and renamed to just
MetaObject.

Change-Id: Iba0b574605e455b01e7b86306ec3ca47be7b4e58
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:04:41 +00:00
Tobias Hunger
514cf70615 Bzr: Report progress during initial checkout
Change-Id: I7d2ade84f991a558d78f8d63bc981a91da517cb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-19 09:46:19 +00:00
Christian Kandeler
0968963100 Bazaar: Fix qbs build.
Change-Id: I1d78d8ab683b2a61f2d6e3bbba9a8eae608ad920
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-19 08:37:07 +00:00
Christian Kandeler
de133ee89c Timeline: Fix qbs build.
Change-Id: If28191975c4290eb364e2b2849cf2b9e3daa6c13
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-19 08:36:48 +00:00
Denis Kormalev
2105115fdf QmlJS: allProjectsInfosForPath method
Method that returns list of all project infos where this file belongs (similar to methods in cpp module).

Change-Id: I94eb86ffa5bdbee8d794377a03160418b7340662
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-05-19 08:00:50 +00:00
Orgad Shaneh
0a94329b17 C++: Minor cleanup in TypeResolver
Change-Id: I9da92d7669d15c1dfd954ec233e21c08b8432b24
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-05-19 06:36:03 +00:00
hjk
f3a46e5ad5 QmakeProjectManager: Remove some dead code
The kitChanged() handling was left over after d972b3b091.

Change-Id: I849b2bc941d17d60e1873357585b37480baeaa6e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 15:41:22 +00:00
Tobias Hunger
1da94d5fac QMakeProjectManager: Replace consoleappwizard with a Json wizard
Change-Id: If05743ad530ee7d589fde324202ffb9c2750a669
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 15:39:28 +00:00
Tobias Hunger
3d0b690d31 Git: Replace CloneWizard with a Json wizard
Change-Id: I2188c083665acc239bc98bf857ff57b071805fbc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 13:43:39 +00:00
Tobias Hunger
bf249dc660 JsonWizard: Add option to only scan for the first project
Make that option the default. This matches what the earlier
checkout wizards used to do.

Change-Id: I935c45b213bc3b688e964340ebebf74c597b3896
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 13:41:40 +00:00
Tim Jenssen
3c9efc3e72 refactor NodeInstanceMetaObject
Reduce the use of NodeInstanceMetaObject in QtQuickDesigner code
to two static methods:
 - registerNodeInstanceMetaObject
 - createNewDynamicProperty

Change-Id: I0ef8ee96995184e968467b799147c6b4c80fbccc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:27:03 +00:00
Tim Jenssen
8409c6a724 remove unused code
engine can be used from the ObjectNodeInstance and
prefix is not used since some time.

Change-Id: I857537643f149955a8ca9c5538ad15420bca9ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:26:57 +00:00