Thomas Hartmann
8a8b8c4602
QmlDesigner: Add meta hint if item renders children directly
...
In some cases items render their children directly using an effect.
In this case we do not want to hide the children when calling
refFromEffectItem().
If the hint takesOverRenderingOfChildren is set in the .metainfo hints
for a parent item we forward a flag to the puppet and refFromEffectItem()
is not hiding this item,
Change-Id: I37a8c0ad8a15bc914c220e03b1b744779431d655
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io >
2018-03-09 15:05:22 +00:00
Thomas Hartmann
f952c3ee4a
QmlDesigner: Fallback to create types from source
...
We fallback to create types from source, if other means failed.
This can be required if the meta info is incomplete/incorrect when
a C++ type is mocked.
Change-Id: I50d45a6f9d7eba3483da10d9e1d7d6644d9aeb96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io >
2016-10-31 14:30:40 +00:00
hjk
39a38d5679
Wholesale conversion to #pragma once
...
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com >
2016-03-30 15:20:19 +00:00
Tobias Hunger
38cce7eb83
Update License according to agreement with Free Qt Foundation
...
* Update all files in share folder
Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com >
2016-01-19 16:05:29 +00:00
Alessandro Portale
374f84acc7
Qt Quick Designer: License change to Qt Commercial + GPLv3
...
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com >
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com >
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com >
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com >
2015-09-18 12:12:57 +00:00
Thomas Hartmann
c919795a08
QmlPuppet: Bring back simplified NodeInstanceSignalSpy
...
A simplified version of NodeInstanceSignalSpy is required to track
sub objects. I moved all private API usage to QmlPrivateGate.
Change-Id: I86e3e5411eb43777a6b1ab5018a1b8fb9088c666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com >
2015-05-21 07:39:25 +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
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
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
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
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
de2f5f6339
remove NodeInstanceSignalSpy
...
Change-Id: Ia002967367e39ef9f8a6229e3c39d785382cc1a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2015-05-18 11:36:00 +00:00
Eike Ziller
3c85058694
Update License
...
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2015-01-16 12:37:56 +01:00
Eike Ziller
ea27143239
Merge remote-tracking branch 'origin/3.2'
...
Conflicts:
src/libs/utils/ipaddresslineedit.cpp
src/libs/utils/logging.h
src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
src/plugins/android/Android.pluginspec.in
src/plugins/android/androiddeploystep.cpp
src/plugins/android/androiddeploystep.h
src/plugins/android/androiddeploystepfactory.cpp
src/plugins/android/androiddeploystepwidget.cpp
src/plugins/android/androidpackagecreationfactory.cpp
src/plugins/android/androidpackagecreationstep.cpp
src/plugins/android/androidpackagecreationstep.h
src/plugins/android/androidpackagecreationwidget.cpp
src/plugins/android/androidpackagecreationwidget.h
src/plugins/android/javafilewizard.cpp
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/baremetal/BareMetal.pluginspec.in
src/plugins/bazaar/Bazaar.pluginspec.in
src/plugins/beautifier/Beautifier.pluginspec.in
src/plugins/bineditor/BinEditor.pluginspec.in
src/plugins/bookmarks/Bookmarks.pluginspec.in
src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
src/plugins/clangcodemodel/clanghighlightingsupport.cpp
src/plugins/clangcodemodel/clangsymbolsearcher.cpp
src/plugins/classview/ClassView.pluginspec.in
src/plugins/clearcase/ClearCase.pluginspec.in
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
src/plugins/coreplugin/Core.pluginspec.in
src/plugins/cpaster/CodePaster.pluginspec.in
src/plugins/cppeditor/CppEditor.pluginspec.in
src/plugins/cppeditor/cppfilewizard.cpp
src/plugins/cpptools/CppTools.pluginspec.in
src/plugins/cpptools/cpphighlightingsupportinternal.cpp
src/plugins/cpptools/cppmodelmanagerinterface.cpp
src/plugins/cpptools/cppmodelmanagerinterface.h
src/plugins/cvs/CVS.pluginspec.in
src/plugins/debugger/Debugger.pluginspec.in
src/plugins/designer/Designer.pluginspec.in
src/plugins/diffeditor/DiffEditor.pluginspec.in
src/plugins/emacskeys/EmacsKeys.pluginspec.in
src/plugins/fakevim/FakeVim.pluginspec.in
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
src/plugins/git/Git.pluginspec.in
src/plugins/git/gitorious/gitorious.cpp
src/plugins/git/gitorious/gitorious.h
src/plugins/git/gitorious/gitoriousclonewizard.cpp
src/plugins/git/gitorious/gitorioushostwidget.cpp
src/plugins/git/gitorious/gitorioushostwidget.h
src/plugins/git/gitorious/gitorioushostwizardpage.cpp
src/plugins/git/gitorious/gitoriousprojectwidget.cpp
src/plugins/git/gitorious/gitoriousprojectwidget.h
src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
src/plugins/git/gitorious/gitoriousprojectwizardpage.h
src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
src/plugins/glsleditor/GLSLEditor.pluginspec.in
src/plugins/glsleditor/glsleditorfactory.cpp
src/plugins/glsleditor/glslfilewizard.cpp
src/plugins/helloworld/HelloWorld.pluginspec.in
src/plugins/help/Help.pluginspec.in
src/plugins/imageviewer/ImageViewer.pluginspec.in
src/plugins/ios/Ios.pluginspec.in
src/plugins/macros/Macros.pluginspec.in
src/plugins/mercurial/Mercurial.pluginspec.in
src/plugins/perforce/Perforce.pluginspec.in
src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
src/plugins/pythoneditor/PythonEditor.pluginspec.in
src/plugins/pythoneditor/pythoneditorwidget.cpp
src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
src/plugins/qmldesigner/QmlDesigner.pluginspec.in
src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
src/plugins/qmljseditor/qmljseditorfactory.cpp
src/plugins/qmljstools/QmlJSTools.pluginspec.in
src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
src/plugins/qnx/Qnx.pluginspec.in
src/plugins/qtsupport/QtSupport.pluginspec.in
src/plugins/remotelinux/RemoteLinux.pluginspec.in
src/plugins/resourceeditor/ResourceEditor.pluginspec.in
src/plugins/resourceeditor/resourcewizard.h
src/plugins/subversion/Subversion.pluginspec.in
src/plugins/tasklist/TaskList.pluginspec.in
src/plugins/texteditor/TextEditor.pluginspec.in
src/plugins/texteditor/basetexteditor_p.h
src/plugins/texteditor/basetextmark.cpp
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
src/plugins/texteditor/codeassist/defaultassistinterface.h
src/plugins/texteditor/codeassist/iassistproposalitem.cpp
src/plugins/texteditor/itexteditor.cpp
src/plugins/texteditor/itexteditor.h
src/plugins/texteditor/itextmark.cpp
src/plugins/texteditor/plaintexteditor.cpp
src/plugins/texteditor/plaintexteditor.h
src/plugins/texteditor/texteditoractionhandler.cpp
src/plugins/todo/Todo.pluginspec.in
src/plugins/updateinfo/UpdateInfo.pluginspec.in
src/plugins/valgrind/Valgrind.pluginspec.in
src/plugins/vcsbase/VcsBase.pluginspec.in
src/plugins/welcome/Welcome.pluginspec.in
src/plugins/winrt/WinRt.pluginspec.in
tests/auto/debugger/temporarydir.h
Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be
License update
...
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-09 11:41:44 +02:00
Tim Jenssen
2bd550f3fd
QmlDesigner: import only working imports
...
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2014-09-26 15:13:39 +02:00
Thomas Hartmann
b6e6e0123c
QmlDesigner.NodeInstances: Fixing enums for int properties
...
There is no easy way to convert an enum (e.g. Qt.Vertical) to the
integer value without the meta object/QMetaEnum.
For this reason we evluate the enum as an expression
if the target property is int.
Without this patch enums do not work at all for properties defined as int.
Change-Id: I9363a84eef1bf4a3ed2c40b35f7439e249e9bd98
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com >
2014-08-21 13:59:15 +02:00
Marco Bubke
8f3bb6421b
QmlDesigner: Fix enumerations properties
...
Task-number: QTCREATORBUG-12741
Change-Id: I1ef1909d585732a39bbf80b90512851a10f60600
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com >
2014-07-29 19:29:08 +02:00
Marco Bubke
fd732ac0cb
QmlDesigner: Support enumerations for aliases
...
Task-number: QTCREATORBUG-12229
Change-Id: I36632cdcf16a2d391b653be71f2df58cb8814a21
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com >
2014-07-10 17:56:28 +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
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
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
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
89db22a1c8
QmlDesigner: Better componentComplete
...
Change-Id: I2bfdbeabd4d08474d50434d7e13c32b780e783ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-06-18 15:10:43 +02:00
Marco Bubke
30d3e7e51d
QmlDesigner: Fix preview rendering
...
We excluded item which had a node instance. For the preview all item should
be marked dirty.
Change-Id: I0cbad89707d7d94f65ac0d055488e124da40e7b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-06-18 15:09:26 +02:00
Marco Bubke
b97422b710
QmlDesigner: Add container item support in node instances
...
Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-05-30 14:11:57 +02:00
Marco Bubke
7976456002
QmlDesigner: Add content item hack
...
There is no stand content item interface, so try to work around to enable
snapping and anchoring.
Change-Id: Ib2eaf0d6c35e3ba289dd7d55b2ba4c064ad40748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-05-22 14:45:43 +02:00
Marco Bubke
4f28228293
QmlDesigner: Fix anchoring for application window
...
We don't tested that target anchor object are node instances. Now we
search for the parent object recursively.
Change-Id: I2e03e714f858a285309b02f5e88c757f0dcfe7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-05-21 17:13:48 +02:00
Marco Bubke
f68bd231c8
Revert "QmlDesigner: Remove NodeInstancesSignalSpy"
...
This is fixing some anchor movement bugs.
This reverts commit ae409f8bdf
.
Change-Id: Ibe9b8b2601e2bcd1c249b5feda06fb3a29482f4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-05-21 13:08:10 +02:00
Eike Ziller
38b61177f6
Merge remote-tracking branch 'origin/2.7'
...
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
tests/auto/treeviewfind/treeviewfind.pro
Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Marco Bubke
ff4457bb46
QmlDesigner: Prepare for other layout items
...
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-04-22 17:03:37 +02:00
Marco Bubke
40b62e1cfa
QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window
...
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-04-22 17:03:23 +02:00
Eike Ziller
44931c0985
Merge remote-tracking branch 'origin/2.7'
...
Conflicts:
src/plugins/pythoneditor/tools/lexical/pythonformattoken.h
Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Marco Bubke
5d3c1a2a2b
QmlDesigner: Remove old functions in instances
...
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-04-16 16:52:00 +02:00
Marco Bubke
359ef53280
QmlDesigner: Move implementation code in the node instances
...
updateDirtyNodeRecursive and renderPreviewImage belongs to quick image and
not in the node instance server.
Change-Id: I629b89c748036c0614e78bcfa0c837cb16ca6374
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-04-15 13:53:53 +02:00
Thomas Hartmann
d204ee0b43
QmlDesigner: Type of the propertyname is now PropertyName
...
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.
Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
(cherry picked from commit ee4bf638ca
)
Reviewed-by: Marco Bubke <marco.bubke@digia.com >
2013-03-25 13:35:11 +01:00
Marco Bubke
ae409f8bdf
QmlDesigner: Remove NodeInstancesSignalSpy
...
Not anymore needed.
Change-Id: Ia1f4d20138b43184b78fd4f39c391af524072dd2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-03-18 16:45:39 +01:00
Friedemann Kleint
3ec9d6bb64
Fix Krazy warnings about improper include guard in QML debugger.
...
Change-Id: I14be0beae7f678dc2fc8af4324c846d757d0cd9d
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com >
2013-03-15 13:23:17 +01:00
Marco Bubke
29bef4c280
QmlDesigner: Fix byte padding
...
Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-03-05 12:47:10 +01:00
Thomas Hartmann
ee4bf638ca
QmlDesigner: Type of the propertyname is now PropertyName
...
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.
Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-03-05 12:34:39 +01:00
Robert Loehning
a040424d2a
Incremented year in copyright info
...
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-02-01 09:19:26 +01:00
Marco Bubke
7ebc7bfb80
QmlDesigner.NodeInstances: Remove unused functions
...
Change-Id: I597144577c74090c2f8e58a2f3246acc922a43a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2012-11-21 14:09:45 +01:00
Thomas Hartmann
0fd35fcc2e
QmlDesigner.puppet: licence header fix
...
Task-number: QTCREATORBUG-8189
Change-Id: Ib1862dee47b3e340492c9321b9db92a7fe2b4786
Reviewed-by: hjk <qthjk@ovi.com >
2012-11-06 15:43:07 +01:00
Marco Bubke
3982bc22d7
QmlDesigner.NodeInstances: QWeakPointer -> QPointer
...
In Qt5 QPointer should be used instead of QWeakPointer fo QObject tracking.
Change-Id: Ic9cdfaea77574bcf866716ded62bbf2d350d02f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2012-10-04 19:19:49 +02:00
Marco Bubke
2fc24f27d1
QmlDesigner.NodeInstances: Rename SG to Quick
...
Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2012-09-26 18:22:19 +02:00
Marco Bubke
770ab68c45
QmlDesigner.Instances: Refactor the qml2 puppet
...
Change-Id: Iaa7a744ecf13e011addc573a381ea523d2d50a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2012-09-24 11:46:20 +02:00