feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
40,211 Commits 108 Branches 368 Tags
e8c8968ab6e060de7e80fabd1758eb3ea27eb531
Commit Graph

270 Commits

Author SHA1 Message Date
Thomas Hartmann
e8c8968ab6 QmlDesigner.QmlPuppet: Show import error messages on root item 
* If an import fails we show this as an error on the root item.
* If all imports fail (including the QtQuick import) we also
  show an error message, but try to recover using QtQuick 2.0.

Change-Id: Ibfece2acdb9f2a6ba26dfd9b31607507fec82dd1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-03-09 16:14:28 +00:00
Thomas Hartmann
a2aaf0f6eb Fix assert for m_objectInstanceHash 
The hash was not cleaned up in any case and sometimes a new object
gets allocated at the exact same address.
To avoid leaking hashes in m_objectInstanceHash and to avoid the assert,
we remove any deleted QObject from the hash.

Change-Id: I2697ab2b2430ad47932841fb9c0ef88ffa4cbbb1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-02-23 11:52:49 +00:00
Tim Jenssen
f160d2b8f5 add/use error channel puppet -> designer 
Change-Id: Id6988e604ca3a092564a3e572c03b322bc101b77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-02-18 12:34:10 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Tim Jenssen
588f88829f remove too much spaces after "return" 
Change-Id: Ibb39ca8bf172caff8749e4d896d772a740a8de6e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-02-10 10:23:43 +00:00
Tim Jenssen
8df9c08dca remove unused return value 
Change-Id: I92451d983f685df18651d700ed28a8eb275d2ea1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-02-06 11:39:20 +00:00
Thomas Hartmann
e02a9433dd QmlDesigner.Puppet: define default values for Layout attached properties 
Change-Id: Id81ad808e826813334c6f157331c21fe51dfe69c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-02-06 08:58:05 +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
a47fbb8309 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
 2014-11-24 15:43:48 +01:00
Thomas Hartmann
e28fa8406c QmlDesigner.instances: Always use distance field text rendering 
This avoids sub pixel antialias artefacts.

We call disableNativeTextRendering() in updateDirtyNodesRecursive(), because
items might be created or change the property after component complete.

Change-Id: Icd9c87b69434a910c9555540ba7bafdc874afc5a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2014-11-19 12:03:08 +01:00
Eike Ziller
3f1deee5e1 Merge remote-tracking branch 'origin/3.3' 2014-11-06 12:38:37 +01:00
Thiago Macieira
c080f68300 Fix linking with the Intel Compiler for OS X 
ICC does not understand the -sectcreate option. Since this is really
just a linker option, use -Wl to pass it to the linker. This works with
Clang too.

Change-Id: I3edff1a856ba235a60984c745fc144b4046cad77
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
 2014-11-05 19:48:18 +01:00
Thomas Hartmann
d525d28e6f QmlPuppet: Enabling style support 
If a style is activated by setting QT_QUICK_CONTROLS_STYLE we have
to use QGuiApplication instead of QApplication.

Change-Id: I138a4fb75508f989f97b207a7024a426fa379f9e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-30 14:39:01 +01:00
Tim Jenssen
49c39eb029 QmlDesigner: create DesignerSupport on stack 
- it has the same life cycle like the Qt5NodeInstanceServer
 - we don't need to create and delete it (with maybe memory leaks)
 - this fixes a crash while the puppet is closed after an item deletion

Change-Id: Iecd6515eb41324b95e99e151d77ee74895230182
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-22 11:29:30 +02: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
Tim Jenssen
605e869335 QmlDesigner: fix regression from last filter import fix 
- adding line ending to the import code
 - set correct fileUrl to resolve local directory imports

Task-number: QTCREATORBUG-12625
Change-Id: I2861fc5674ff0fa4f6cc9e308a22cd2853ffa85c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-10 11:16:12 +02:00
Tim Jenssen
ab21b7b67a QmlDesigner: move setObjectOwnership 
- to the same position like in the other methods

Change-Id: Ie12147de0e9030a35928a2c0a5dd38d34f998845
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:10:49 +02:00
Tim Jenssen
fd6afba3c3 QmlDesigner: improve error output of the puppets 
- errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-09 18:10:43 +02:00
Tim Jenssen
808094e9e1 QmlDesigner: avoid setContext warning if there is already one 
Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:09:37 +02:00
Tim Jenssen
dce26fc29d QmlDesigner: use engine argument like all similar methods 
Change-Id: I1238cbd60e38ade3f54937ca8f901517c543a3ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:44 +02:00
Tim Jenssen
0ecc1114bd QmlDesigner: remove unnecessary spaces/lines 
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:09 +02:00
Tim Jenssen
80bc7f79bc QmlDesigner: remove commented connect 
The connected SLOT is even not existing any more.

Change-Id: Iea352ca4929146c20b897e1a8fbb00a601364068
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:07:29 +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
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
 2014-09-16 15:17:21 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system 
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-15 12:10:01 +02:00
Tim Jenssen
4ca49dc909 QmlDesigner: add more specifics 
Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-09 16:21:44 +02:00
Tim Jenssen
d6fbffbff0 QmlDesigner: clean up QWeakPointer use 
Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-05 15:16:46 +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
Thomas Hartmann
bfdffd2a7d QmlDesigner.NodeInstances: Check expressions 
I do not see any reason to set an expression that contains a
code block.

Change-Id: I74960a6bac741db46d86e33299e8b1669e781e65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-11 13:44:53 +02:00
Thomas Hartmann
03ac986413 QmlDesigner.NodeInstances: Adding more objects to the ignore list 
There is no real reason to ever instantiate those.

Change-Id: I1bb86b5f5794f10bf2cad124499df6ee8add6909
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-08 09:45:33 +02:00
Tim Jenssen
e917559319 QmlDesigner: prioritize puppet processes a bit 
Change-Id: I97d846cb46851f8f3067d839aeb0b856298ed0c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-08-05 16:59:27 +02:00
Marco Bubke
0da08c227f QmlDesigner: Use a POSIX shared memory for unix 
QSharedMemory is using SVR4 shared memory for unix which is limited to
4 MB globally which is really hurting the performance for the designer.
POSIX shared memory is lifting some of this constraints but still has
some bugs on Max OS but generally works better.

Change-Id: I74c1ffd56495f408cd9340cd159190a1175a4086
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-31 16:48:27 +02:00
Tim Jenssen
5778a39317 QmlDesigner: read window mock from file 
Change-Id: Ic525b1d3ac18c42c6abb6a93195e220465dd017f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-30 13:44:01 +02:00
Marco Bubke
0ee609f8fc QmlDesigner: Fix reset width and height 
Task-number: QTBUG-38426
Change-Id: I28e9ed70042c118ff65801c4d07e5a67dc7c3db1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-30 12:34:58 +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
3146340211 QmlDesigner: Get whole values for value types too. 
Task-number: QTCREATORBUG-12130
Change-Id: Ic43826060d9ce38aded7fc3a68dff2ea6860bfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-29 17:54:39 +02:00
Tim Jenssen
9898ac50e1 QmlDesigner: fix that an invalid root item refreshes the preview 
Change-Id: I8d917dfd92261a88472bd49577731f5bcf468d49
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-07-22 11:27:35 +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
b04304ee11 QmlDesigner: Slow down the preview timer 
The painting is slowing down the form editor.

Change-Id: I71afbefff353d23bd25fb9877ee70b896b73b378
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-07 16:09:49 +02:00
Marco Bubke
d74521d0ae QmlDesigner: Use Rectangle instead of Item for dummy Window 
Task-number: QTCREATORBUG-12484
Change-Id: I6d96367159dd813531046af4412bc10e5cb5df0f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-04 15:43:01 +02:00
Marco Bubke
5c551932b4 QmlDesigner: Always test if there is a instance for an id or object 
Change-Id: I90ff8861de8879e300932bd61afb29f8ec3b9fc4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-03 12:17:55 +02:00
Marco Bubke
9cee5d3b22 QmlDesigner: Fix implicitHeight in resetVertical 
Task-number: QTCREATORBUG-11542
Change-Id: Ia69a95abe42ad0c10b8d65663d252f15cf38cf02
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-01 09:33:36 +02:00
Marco Bubke
1526dd0aa6 QmlDesigner: Remove harmful updates 
From the quick1 times we always have done a update but it is not any more
useful and it is triggering a repaint which makes the form editor sluggish.

Change-Id: I8103d03c295aa73e14b4b4fcec15b01069c62754
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:39:22 +02:00
Marco Bubke
1014291c01 QmlDesigner: Fix rendering rendering of items 
The else clause was wrong. It should be that it is not a node instance but
it was that it was not a dirty node instance.

Change-Id: I657bbc03826edcb9a1ea46f9c3b44404b2d3f31a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:39:16 +02:00
Marco Bubke
05d5b9c3ec QmlDesigner: Always reset the items in the render loop 
To be sure the are not any more dirty. This can be no harm.

Change-Id: I861243f1f4435b0dbdc2a6373ebfdfef12fb2627
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:38:58 +02:00
Marco Bubke
a980ea98bb QmlDesigner: Add a special root item of the view too 
Change-Id: Ie7cc58d3793717fce979ccd554060b91bc0d7040
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:55 +02:00
Marco Bubke
a5c3c9af0e QmlDesigner: Do the dirty test only for non node instances 
The test should stop at the next node instance.

Change-Id: I99daf1215edea34b36434720c44ea7844c4bef34
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:32 +02:00
Marco Bubke
854a0f25a1 QmlDesigner: Fix recursive all item function 
Change-Id: I074201639a9fcac40d9c3ca4bb50be46edb88957
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:30:00 +02:00
Marco Bubke
6cee8a42ff QmlDesigner: Add test if the instance exists 
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:41 +02:00