feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
41,102 Commits 108 Branches 368 Tags
ab2a0d74dec2df08d23e14b5b3ad670d98af435f
Commit Graph

254 Commits

Author SHA1 Message Date
Thomas Hartmann
4763acbd95 QmlPuppet: Clean up private API usage in QmlStateNodeInstance 
Change-Id: If1c8cee81cbdd6f90808a824c2b4d023dd8a3e12
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-05-21 07:39:35 +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
7415ea9563 QmlPuppet: Remove unused private header 
Change-Id: I699c423c3d4a84659e074e310e8697cd19f5c4c0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-05-20 14:02:48 +00:00
Thomas Hartmann
afd903c4a4 QmlPuppet: Remove private dependencies from NodeInstanceServer 
Change-Id: I386bd18704020d0b174cda224c4cf46245227877
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-05-20 14:02:43 +00:00
Thomas Hartmann
6fe2c1455c QmlPuppet: Remove private dependencies from PositionerNodeInstance 
Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-05-20 14:02:30 +00:00
Thomas Hartmann
0d67510270 QmlPuppet: Remove private dependencies from BehaviorNodeInstance 
Change-Id: I16f2c4189f7b68bf1cff90d0a9987b4bf4212905
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-05-20 14:02:24 +00:00
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
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
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
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
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
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
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
Tim Jenssen
de2f5f6339 remove NodeInstanceSignalSpy 
Change-Id: Ia002967367e39ef9f8a6229e3c39d785382cc1a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-18 11:36:00 +00:00
Tim Jenssen
1e9f7e1e44 fix spelling in a comment 
Change-Id: I7241a1e7e4cad1c1614ac95e7fe4e3a080eab265
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-18 11:13:33 +00:00
Tim Jenssen
76245df442 remove spaces 
Change-Id: I0ca4812acd7c7efa710e18204ab0cd4426827396
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-18 11:12:44 +00:00
Tim Jenssen
31ddfd3e0a reorder includes and use <> where it makes sense 
Change-Id: Ia4957cb5cfd2a58d293bda190490f30cdf475dd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-18 11:12:36 +00:00
Thomas Hartmann
cf8d601b1d QmlDesigner.Instances: removing unused argument 
Change-Id: Iff03a4659c02eb348d58957b2abb6676e5da8a7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
 2015-03-10 12:04:50 +00:00
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
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
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