Commit Graph

59 Commits

Author SHA1 Message Date
Alessandro Portale
859d847769 QmlDesigner: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-25 12:53:26 +00:00
Thomas Hartmann
c25ba91fc1 Fix compile
Change-Id: I0837b8830735f80dd98928769e603907226ab6e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-03-09 15:37:37 +00:00
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
Robert Loehning
6d60aae8ef QmlPuppet: Check return value of fstat
Change-Id: I2b7c04712a883455d8a5a0daa1225c2ef84a0748
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-09-26 16:44:58 +00:00
Tim Jenssen
4f03ea96a2 QmlDesigner: fix uninitialzed value warnings
Change-Id: Ieddd83953b2009656ceecea2f9fedecd54ac9ac8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-19 09:10:29 +00:00
Eike Ziller
dae2556d2f Merge remote-tracking branch 'origin/4.3'
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
2017-04-21 15:30:00 +02:00
Montel Laurent
d29396b164 Use qEnvironmentVariableIsEmpty or qEnvironmentVariableIsSet directly
Change-Id: I4f2e61e4bade9e7b4518d144db8163e596ab6264
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-19 08:00:14 +00:00
Thiago Macieira
b34dc8fdb2 Cast enum to the an integer type before streaming out to QDataStream
We stream in as int or as qint32, so this is symmetric.

Change-Id: Ic46ff326a6ba46bc877cfffd148325c21241f3b1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-04-05 05:13:43 +00:00
Thomas Hartmann
5eeecdb1b4 QmlDesigner: Fixing double free
Calling detach() in setKey() will free the shared memory twice, if
we do not set m_memory to nullptr.
Clean cleanHandleInternal() does always return true, so
checking the value does not make sense.
We have to call cleanHandleInternal() immediately after the close.

Change-Id: I110693d1dd9dae4ff5e52cfd3fdd2f33137af969
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 08:29:25 +00:00
Thomas Hartmann
d3b4acfae2 QmlDesigner: Allow qml2puppet to mockup C++ types
This allows Qt Quick Designer to register a component that can serve
as a mockup for known C++ components registered in e.g. main.cpp.

In many cases those components are the interface to the C++ backend.
While the C++ components itself are not relevant for the gui designer,
the user has to be able to instantiate gui components that use such C++
components.

We use the CreateSceneCommand to forward a list of C++ types to
qml2puppet.
Those types are then registered so that the imports and object institation
works.

Change-Id: I1543912f233f9a783998f3c6a1b48981b342ee80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-04 08:59:24 +00:00
Ulf Hermann
7dab165c3b QmlPuppet: Don't crash when failing to lock shared memory
Obviously, you cannot set m_sharedMemory to 0 and then write the error
and errorString to it.

Change-Id: Ifcacfd7adcb4ff2fd88ebda21aa81094337233f6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-19 14:07:18 +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
hjk
49735ee5ee QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed
Change-Id: I535efad65b2224337c133463da075953cc878c6c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-18 14:17:04 +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
Jarek Kobus
f7c98fa6ab Replace assignment of null QString() with a call to clear().
Looks like it's a kind of rule in QtCreator code.

Change-Id: I92fb60055273d66d6e459245836df5b90d7a3cc6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-16 12:07:31 +00:00
Thomas Hartmann
83e128ec79 QmlDesigner.Instances: use TypeName instead of QString
A dynamicTypeName has to be always latin1 so we should use TypeName
instead of QString.

Change-Id: I06c945aa61f677788285cbc8ff8f5811f6c61b0b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-16 09:43:41 +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
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
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Eike Ziller
0aecf9c195 Merge remote-tracking branch 'origin/3.1' into 3.2
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
2014-09-29 10:31:12 +02:00
Thiago Macieira
34d897165d Fix the build: add missing #includes
<QWidget> for QWidget, <QDataStream> for QDataStream and <QMetaObject>
for Q_GADGET (technically, qobjectdefs.h)

Change-Id: Ia7e8b12ff4c67827bb7782a0337714e330de1db1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-18 15:11:56 +02:00
Tim Jenssen
84bc03c025 QmlDesigner: fix Qt4 compile
Change-Id: Iad9bd3eaff445b9329452d89da0c641e8c8f25df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-05 22:27:08 +02:00
Tim Jenssen
b7dbbc6ef0 QmlDesigner: fix crash on mac
Came from two deletions at the same time QCache::remove and
delete on sharedMemory.QmlDesigner:

Change-Id: I6a29cf160c8e81ecd955cf36999edc639fbbb63f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:30:47 +02:00
Tim Jenssen
d315a71c30 QmlDesigner: cleanup code
Change-Id: Ibebef6313113ff0097586373795e6117b7112876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:08 +02:00
Tim Jenssen
0370fa214a QmlDesigner: Use Q_GLOBAL_STATIC_WITH_ARGS for the global hash
To be sure that the shared memories are removed at process exit.
And fix that createSharedMemory reuse possible already existing shared
memories now. ("take" -> "[]")

Change-Id: Idcc99ba42b862b862d5403ecf3b781a27fdf757f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:02 +02:00
Marco Bubke
80a39815f0 QmlDesigner: Limit native key to 31 letter
OS X is only supporting a maximum of 31 letters for shared memory names.

Change-Id: I61351228decaa3fa7ec19a6035620ab932cf5386
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:38:13 +02:00
Tim Jenssen
0cfab4ca43 QmlDesigner: using old QRegExp works on all Qts
Change-Id: I9650efac738c76b8ace531416ac8e4664f637ffb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 11:21:41 +02:00
Tim Jenssen
186f82a730 QmlDesigner: SharedMemory key needs to be the same with all Qts
Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 11:17:30 +02:00
Tim Jenssen
2bfd14dbf8 QmlPuppet: Fix compile with Qt older than 5.2
Change-Id: I0ef3c5e374b1b01c22b553b99dfbd8eb7783fa90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 10:40:21 +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
Orgad Shaneh
8a42154f24 QmlPuppet: Remove duplicate condition
Change-Id: I2a521aa08347d83b236d490e698081e552381ed7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 11:44:02 +02:00
Marco Bubke
edf23211e2 Revert "QmlDesigner: Hotfix for older puppets"
It is a hotfix.

This reverts commit de7d2d7aa3.

Change-Id: Ib0165128183b5811fc548aee3b3a82fba376123c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:02:58 +02:00
Thomas Hartmann
de7d2d7aa3 QmlDesigner: Hotfix for older puppets
Older puppets crashes if we send enumerations so we convert them before.
This patch has to be reverted in master.

Change-Id: Id33e776616ea6e74c7b14799e3aed130c39f8fed
Hotfix: 3.1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 15:23:13 +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
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
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
90ce3aec8b QmlDesigner: Test mode for qml puppet streams
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-08 11:28:38 +02:00
Marco Bubke
2753ca94c7 QmlDesigner: Remove unused code
Change-Id: I08e98f22d3afd5911c56f1471701587db9d9c446
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-28 15:58:55 +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
Thomas Hartmann
7076272bf5 QmlDesigner.Instances: fix delemiting of type names
Import are delemited with a "." and there is a "/" between
import and type.

e.g.: QtQuick.Layout/QQuickLayout

Change-Id: I7750b333296cceef99992610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 13:21:32 +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
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
Thomas Hartmann
ac186ff7ae QmlDesigner: final compile fixes for 2.6 on Qt 5
Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:41 +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