feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
267946d100190d2e76dc444463e690257860cbb7
qt-creator/src/tools/qml2puppet/qml2puppet.qbs

240 lines
9.5 KiB
QML
Raw Normal View History

qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
import qbs
import QtcFunctions
QtcTool {
name: "qml2puppet"
Fix qbs build on macOS "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-07-28 11:29:06 +02:00
installDir: qbs.targetOS.contains("macos")
qbs build: Introduce new module "qtc". The qtc module gathers properties that used to live in the top-level project file. This is the first step towards making it possible to build plugins against an installed Qt Creator ("out of source build"). Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-17 10:50:51 +02:00
? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
qml2puppet: Fix qbs build Change-Id: Id89119554b6934f419361735e3540248944416a7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-07 10:00:38 +02:00
Depends { name: "Utils" }
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
Depends { name: "bundle" }
Depends {
name: "Qt"
submodules: [
"core-private", "gui-private", "network", "qml-private", "quick", "quick-private",
"widgets"
]
}
cpp.defines: base.filter(function(d) { return d != "QT_CREATOR"; })
Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")
cpp.dynamicLibraries: base.concat("rt")
}
qbs build: Do not access the bundle module unconditionally We should not rely on its presence on non-Darwin platforms. Change-Id: I3fa722038f9c2d1139f6e1dc8c49d1c4d2fe0bee Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-08-02 10:03:31 +02:00
Properties {
condition: qbs.targetOS.contains("darwin")
bundle.embedInfoPlist: true
}
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
property path puppetDir: "../../../share/qtcreator/qml/qmlpuppet"
cpp.includePaths: base.concat([
puppetDir + "/commands",
puppetDir + "/container",
puppetDir + "/instances",
puppetDir + "/interfaces",
puppetDir + "/types",
puppetDir + "/qml2puppet/instances",
puppetDir + "/qmlprivategate",
])
// TODO: Put into static lib and share with qmldesigner
Group {
name: "puppet sources"
prefix: puppetDir + '/'
files: [
"commands/changeauxiliarycommand.cpp",
"commands/changeauxiliarycommand.h",
"commands/changebindingscommand.cpp",
"commands/changebindingscommand.h",
"commands/changefileurlcommand.cpp",
"commands/changefileurlcommand.h",
"commands/changeidscommand.cpp",
"commands/changeidscommand.h",
"commands/changenodesourcecommand.cpp",
"commands/changenodesourcecommand.h",
"commands/changestatecommand.cpp",
"commands/changestatecommand.h",
"commands/changevaluescommand.cpp",
"commands/changevaluescommand.h",
"commands/childrenchangedcommand.cpp",
"commands/childrenchangedcommand.h",
"commands/clearscenecommand.cpp",
"commands/clearscenecommand.h",
"commands/completecomponentcommand.cpp",
"commands/completecomponentcommand.h",
"commands/componentcompletedcommand.cpp",
"commands/componentcompletedcommand.h",
"commands/createinstancescommand.cpp",
"commands/createinstancescommand.h",
"commands/createscenecommand.cpp",
"commands/createscenecommand.h",
"commands/debugoutputcommand.cpp",
"commands/debugoutputcommand.h",
"commands/endpuppetcommand.cpp",
"commands/endpuppetcommand.h",
"commands/informationchangedcommand.cpp",
"commands/informationchangedcommand.h",
"commands/pixmapchangedcommand.cpp",
"commands/pixmapchangedcommand.h",
"commands/puppetalivecommand.cpp",
"commands/puppetalivecommand.h",
"commands/removeinstancescommand.cpp",
"commands/removeinstancescommand.h",
"commands/removepropertiescommand.cpp",
"commands/removepropertiescommand.h",
"commands/removesharedmemorycommand.cpp",
"commands/removesharedmemorycommand.h",
"commands/reparentinstancescommand.cpp",
"commands/reparentinstancescommand.h",
"commands/statepreviewimagechangedcommand.cpp",
"commands/statepreviewimagechangedcommand.h",
"commands/synchronizecommand.cpp",
"commands/synchronizecommand.h",
"commands/tokencommand.cpp",
"commands/tokencommand.h",
"commands/valueschangedcommand.cpp",
"commands/valueschangedcommand.h",
QmlDesigner: Implement command for synchronising the selection This patch implements the command and dispatchers for synchronising the selection between Qt Creator and the qml2puppet. Qt5InformationNodeInstanceServer::changeSelection() is called whenever the selection is changed in Qt Creator. Qt5InformationNodeInstanceServer::changeSelection() allows to change the selection from the qml2puppet. Change-Id: I73a64d8dc2a3f330433f966b42a10229cbbff649 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-10-17 13:51:57 +02:00
"commands/changeselectioncommand.cpp",
"commands/changeselectioncommand.h",
Implement DnD 3D objects from the item library to the EditView3D Proof of concept drag and drop implementation. Basic functionality working but needs polish. Task-number: QDS-1132 Change-Id: Ie3b9e80de9a414c4955d6e38daf338045bc1e614 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-01 10:51:09 +02:00
"commands/drop3dlibraryitemcommand.cpp",
"commands/drop3dlibraryitemcommand.h",
Improve edit view 3D "on top" logic - Proxy dialog removed - When the QDS window is minimized/maximized, the edit view 3D follows. The opposite is not true (edit view 3D can be minimized separately). - Edit view 3D is always on top of QDS window. Only exception is when a popup is shown (so that the user can handle the popup). - External apps go normally on top of the edit view 3D. Known (non critical) issues: - Activating the edit view 3D doesn't raise() the QDS window, so if an external app is on top of the edit view 3D then the view is clicked, the external app will be in between the view and the QDS window. - Closing the edit view 3D from the x button doesnt work (causes a restart). This is not in the scope of this commit. Task-number: QDS-1179 Change-Id: I1dd72590037be295b94735de96772307ba14c59c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-12-11 21:29:10 +02:00
"commands/update3dviewstatecommand.cpp",
"commands/update3dviewstatecommand.h",
"commands/enable3dviewcommand.cpp",
"commands/enable3dviewcommand.h",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"container/addimportcontainer.cpp",
"container/addimportcontainer.h",
"container/idcontainer.cpp",
"container/idcontainer.h",
"container/imagecontainer.cpp",
"container/imagecontainer.h",
"container/informationcontainer.cpp",
"container/informationcontainer.h",
"container/instancecontainer.cpp",
"container/instancecontainer.h",
QmlDesigner: Fix qbs build Change-Id: I768b233f23b836bb235931b1384d829d63a86f6f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-04 17:25:38 +02:00
"container/mockuptypecontainer.cpp",
"container/mockuptypecontainer.h",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"container/propertyabstractcontainer.cpp",
"container/propertyabstractcontainer.h",
"container/propertybindingcontainer.cpp",
"container/propertybindingcontainer.h",
"container/propertyvaluecontainer.cpp",
"container/propertyvaluecontainer.h",
"container/reparentcontainer.cpp",
"container/reparentcontainer.h",
"container/sharedmemory.h",
"instances/nodeinstanceclientproxy.cpp",
"instances/nodeinstanceclientproxy.h",
"interfaces/commondefines.h",
"interfaces/nodeinstanceclientinterface.h",
"interfaces/nodeinstanceserverinterface.cpp",
"interfaces/nodeinstanceserverinterface.h",
"qmlprivategate/qmlprivategate.h",
"types/enumeration.h",
]
}
Group {
name: "SharedMemory (Unix)"
condition: qbs.targetOS.contains("unix")
prefix: puppetDir + "/container/"
files: ["sharedmemory_unix.cpp"]
}
Group {
name: "SharedMemory (Generic)"
condition: !qbs.targetOS.contains("unix")
prefix: puppetDir + "/container/"
files: ["sharedmemory_qt.cpp"]
}
Group {
name: "puppet2 sources"
prefix: puppetDir + "/qml2puppet/"
files: [
"../qmlpuppet.qrc",
qml2puppet: Fix qbs build. Change-Id: I688b21cad35eb96676e7d39c20641b9312542cb2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-17 16:34:31 +02:00
"Info.plist",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"instances/anchorchangesnodeinstance.cpp",
"instances/anchorchangesnodeinstance.h",
"instances/behaviornodeinstance.cpp",
"instances/behaviornodeinstance.h",
"instances/childrenchangeeventfilter.cpp",
"instances/childrenchangeeventfilter.h",
"instances/componentnodeinstance.cpp",
"instances/componentnodeinstance.h",
"instances/dummycontextobject.cpp",
"instances/dummycontextobject.h",
"instances/dummynodeinstance.cpp",
"instances/dummynodeinstance.h",
"instances/layoutnodeinstance.cpp",
"instances/layoutnodeinstance.h",
"instances/nodeinstanceserver.cpp",
"instances/nodeinstanceserver.h",
"instances/nodeinstancesignalspy.cpp",
"instances/nodeinstancesignalspy.h",
"instances/objectnodeinstance.cpp",
"instances/objectnodeinstance.h",
"instances/positionernodeinstance.cpp",
"instances/positionernodeinstance.h",
"instances/quickitemnodeinstance.cpp",
"instances/quickitemnodeinstance.h",
"instances/qmlpropertychangesnodeinstance.cpp",
"instances/qmlpropertychangesnodeinstance.h",
"instances/qmlstatenodeinstance.cpp",
"instances/qmlstatenodeinstance.h",
QmlDesigner: Implement Quick3DNodeInstance wrapper We use Quick3DNodeInstance as a proxy class to wrap QQuick3DNode. The access to private API like QQuick3DNodePrivate::setIsHiddenInEditor() is restriced by such proxy classes. Change-Id: If5191c3b730359000cf983c3af206dcffa07be74 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-17 18:27:57 +02:00
"instances/quick3dnodeinstance.cpp",
"instances/quick3dnodeinstance.h",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"instances/qmltransitionnodeinstance.cpp",
"instances/qmltransitionnodeinstance.h",
QmlDesigner: Fix qbs build Change-Id: Iad0691908ca09687b77f98bd47eff09b6a6c063c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-08-01 11:25:24 +02:00
"instances/qt3dpresentationnodeinstance.cpp",
QmlDesigner: Fix typo in file name Change-Id: I06086caeaa2144e93203bc0cea902259be5d73c5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-01 11:51:02 +02:00
"instances/qt3dpresentationnodeinstance.h",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"instances/qt5informationnodeinstanceserver.cpp",
"instances/qt5informationnodeinstanceserver.h",
"instances/qt5nodeinstanceclientproxy.cpp",
"instances/qt5nodeinstanceclientproxy.h",
"instances/qt5nodeinstanceserver.cpp",
"instances/qt5nodeinstanceserver.h",
"instances/qt5previewnodeinstanceserver.cpp",
"instances/qt5previewnodeinstanceserver.h",
"instances/qt5rendernodeinstanceserver.cpp",
"instances/qt5rendernodeinstanceserver.h",
"instances/qt5testnodeinstanceserver.cpp",
"instances/qt5testnodeinstanceserver.h",
"instances/servernodeinstance.cpp",
"instances/servernodeinstance.h",
QmlDesigner: Implement better camera navigation in 3D edit view Edit camera is now controlled as in Qt 3D Studio: ALT + left button orbits camera. ALT + middle button pans camera. ALT + right button zooms camera. Wheel zooms camera. Task-number: QDS-1206 Change-Id: Ia72644073d172b00483ceed8bcc5ffb8dce68741 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-15 15:20:31 +02:00
"editor3d/generalhelper.cpp",
"editor3d/generalhelper.h",
QmlDesigner: Add support for move gadget to 3D edit view This proof-of-concept move gadget is based on the move gadget in studio example of QtQuick3D. Change-Id: I1b596443a3e99c16ed214bc464c5367a0f7aa503 Fixes: QDS-1125 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
2019-10-23 16:02:56 +03:00
"editor3d/mousearea3d.cpp",
"editor3d/mousearea3d.h",
QmlDesigner: Implement camera frustum visualization for edit 3D Task-number: QDS-1208 Change-Id: I3241fcdc68d01666a2536df32f170cd898cbd7af Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-07 10:46:14 +02:00
"editor3d/camerageometry.cpp",
"editor3d/camerageometry.h",
QmlDesigner: Implement proper helper grid for 3D edit view Change-Id: I9e33218d4b1528610155c5fb9bf94a9597ee23df Fixes: QDS-1204 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-13 17:02:52 +02:00
"editor3d/gridgeometry.cpp",
"editor3d/gridgeometry.h",
QmlDesigner: Implement selection box to 3D edit view Change-Id: Ib0b13ecd7946e3b7da8ed06d4f5965e06e51a152 Fixes: QDS-1210 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-19 17:43:03 +02:00
"editor3d/selectionboxgeometry.cpp",
"editor3d/selectionboxgeometry.h",
qbs build: Add product file for qml2puppet. Change-Id: I387daf12c3681074f0ec7cc5a6ae656f4c1d4e73 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-12 16:27:12 +02:00
"qml2puppetmain.cpp",
]
}
Group {
name: "qmlprivategate (new)"
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.6.0")
prefix: puppetDir + "/qmlprivategate/"
files: [
"qmlprivategate_56.cpp",
]
}
Group {
name: "qmlprivategate (old)"
condition: !QtcFunctions.versionIsAtLeast(Qt.core.version, "5.6.0")
prefix: puppetDir + "/qmlprivategate/"
files: [
"designercustomobjectdata.cpp",
"designercustomobjectdata.h",
"metaobject.cpp",
"metaobject.h",
"qmlprivategate.cpp",
]
}
}
Copy Permalink