aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* QmlDesigner: Add light meshes to edit 3d viewMiikka Heikkinen2020-03-122-0/+3
| | | | | | | Change-Id: I996498fde14510fc78c729f56cb8d46b28b233bb Fixes: QDS-1634 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Remove the standalone view3D window implementationMahmoud Badri2020-03-052-6/+0
| | | | | | Task-number: QDS-1692 Change-Id: I6c04aaee9ab6a119cfcc22ee2e19b808bb95ae0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Port Edit 3D View to 5.15Miikka Heikkinen2020-03-041-1/+1
| | | | | | | | | Qt 5.15.0 is now the minimum version to enable Edit 3D view. Change-Id: I15cee59e6a7665477825caa0ae412fc6ac7b570a Fixes: QDS-1694 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Integrate Edit3D view into CreatorMiikka Heikkinen2020-02-242-3/+6
| | | | | | | | | Edit3D view is now a tab alongside Form Editor. Buttons were moved to a Creator side task bar on Edit 3D view. Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e Fixes: QDS-1570 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Clang: Fix build with Clang/LLVM 10Orgad Shaneh2020-02-208-21/+84
| | | | | Change-Id: I740286c9dcfd325b1c31ab863fb5c91bf9c6ec70 Reviewed-by: hjk <hjk@qt.io>
* Bump perfparser to head of 4.12 branchEike Ziller2020-02-131-0/+0
| | | | | | | Adding CMake build, updated version number and more Change-Id: I62525b3a2239f0cb6c2906e3aedc7cfed2b64d09 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake build: Put wininterrupt and cdbextension into separate componentsEike Ziller2020-02-111-0/+1
| | | | | | | | And make it possible to turn off building the cdbextension library. So they can be installed and packaged separately Change-Id: Ic7da1411aa3973604b897e1cbf57ad9c5b0fe460 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Fix building sdktool against static QtEike Ziller2020-02-071-0/+9
| | | | | | | On Windows. This is a hack, but enough for the purpose of packaging. Change-Id: I308b80dcf37e26e5c69f2fd6631b4b38854d68e0 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Fix sdktool location for standalone buildEike Ziller2020-01-311-2/+8
| | | | | | | | Avoid the path to libexec inside the Qt Creator bundle if building sdktool standalone Change-Id: Id893a523d262b846cbbed7d73fa28751e404102a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Make it possible to build sdktool separatelyEike Ziller2020-01-311-3/+31
| | | | | Change-Id: Iedd74be8fbd38b4409ca2a40b09ae03c761476a0 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Delete unused imageAlessandro Portale2020-01-291-2/+0
| | | | | Change-Id: I8065ce945c8c54e072676d5840c092bc5e410c3d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake Build: add perfparserCristian Adam2020-01-281-0/+4
| | | | | Change-Id: Ib16548befefbb827f2752300f9e67da3cf91570c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Use isEmpty() instead of count() or size()Alessandro Portale2020-01-202-2/+2
| | | | | Change-Id: I0a89d2808c6d041da0dc41ea5aea58e6e8759bb4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Workaround 5.15 deprecations in QTextStreamsDavid Schulz2020-01-173-26/+21
| | | | | Change-Id: Ifc2b7fd353e7c12346e9716115e830679cea7666 Reviewed-by: hjk <hjk@qt.io>
* Make various Q_LOGGING_CATEGORY's staticAlessandro Portale2020-01-152-2/+2
| | | | | Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix CMake build of qml2puppetAlessandro Portale2020-01-141-1/+1
| | | | | | | | qtcreator/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/ mousearea3d.h(60): Error: Undefined interface Change-Id: I11d8709e8e347407a2499bdf4c72aaa7f41386f4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* QmlDesigner: Add pivot point visualization line to 3D edit viewMiikka Heikkinen2020-01-142-0/+3
| | | | | | | | | A line connecting the pivot point and object center is added to 3D edit view. Change-Id: Ic265e9a3ab2895761cc92b94c778d68509ef36f1 Fixes: QDS-1474 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-01-082-0/+3
|\ | | | | | | Change-Id: Ica0d173a08ff3f0296e875aa324d5bb6974bd90f
| * Enable common keyboard hotkey actions for the Edit View 3DMahmoud Badri2020-01-072-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking undo, redo, delete, or save keyboard hotkeys while the Edit View 3D has focus is working now. Additionally this commit introduces a generic command for carrying any variant data from puppet to creator side. This significantly simplifies and avoids the boiler plate work of sending actions from puppet to creator side. Current commands can be ported to use this generic command but this is not part of this commit. Also a similar command to work the other way around could be implemented. Task-number: QDS-1266 Change-Id: I40fdf6b215ce77402250a791ea49cbdcd2a9d6eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QbsProjectManager: Add a settings category iconAlessandro Portale2019-12-191-0/+22
| | | | | | | | | | | | | | | | | | Qbs... Cubes.. 6 cubes that result in a familiar silhouette. No? Well, IMHO at least better than no icon at all. Change-Id: I7d3a1824a096f4a083410df53db89eba87ff1b1e Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-12-182-0/+3
|\| | | | | | | Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
| * Prevent the Edit View 3D restart upon closingMahmoud Badri2019-12-172-0/+3
| | | | | | | | | | | | | | | | | | Also the 2D/3D action updates correctly according to Edit View 3D state. Task-number: QDS-1385 Change-Id: I95d0994e9c56df25a2988eb9d27994268dd1903d Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-12-162-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/boot2qt/qdbrunconfiguration.cpp src/plugins/boot2qt/qdbrunconfiguration.h src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qnx/qnxrunconfiguration.cpp src/plugins/remotelinux/remotelinuxrunconfiguration.h Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
| * Improve edit view 3D "on top" logicqds/v1.4.0-rc1Mahmoud Badri2019-12-132-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | ManhattanStyle: Fix themed drawing of toolbar extensionAlessandro Portale2019-12-101-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | The extension image gets queried via QStyle::standardIcon() instead of QStyle::standardPixmap(). That's why so far our extension was never drawn with our own icon. The icon .png needed to be resized in order not to be resampled in @2x mode. Change-Id: I27ae4e5872c18421e5d40271b01cb9daf8adc8bc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/4.11'"The Qt Project2019-12-092-0/+3
|\ \
| * | Merge remote-tracking branch 'origin/4.11'Orgad Shaneh2019-12-072-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportrunconfiguration.cpp src/plugins/python/pythonproject.cpp src/plugins/qmakeprojectmanager/qmakestep.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
| | * QmlDesigner: Use proxy dialog for 3D edit viewThomas Hartmann2019-11-282-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To integrate the 3D edit view in the qml2puppet process, we create a dialog in the Qt Creator process. This dialog acts as a proxy that manages the actual window. For this I introduced a new command that allows showing, hiding, resizing and moving of the 3D edit view. The 3D edit view always follows the proxy dialog. During moving and resizing we hide the window to avoid artefacts. At this point in time the proxy widget is a dialog, but it could also be a dockwidget or any other QWidget in the future. Task-number: QDS-1179 Change-Id: I67ccab49eb2de9ba23098a67b2f9577f6c7fd3ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | SDKTool: Allow for explicitly unsetting Qt in addKitOperationTobias Hunger2019-12-091-0/+5
|/ / | | | | | | | | | | | | | | | | Treat a empty string passed in as argument to --qt as "No Qt" by forcing that to "-1". Fixes: QTCREATORBUG-23168 Change-Id: I03c536d0cc0f7bc2ad291a2bbcc5297df509b524 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-282-3/+6
|\| | | | | | | | | | | | | Conflicts: src/plugins/designer/codemodelhelpers.cpp Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
| * QmlDesigner: Implement selection box to 3D edit viewMiikka Heikkinen2019-11-222-0/+3
| | | | | | | | | | | | | | Change-Id: Ib0b13ecd7946e3b7da8ed06d4f5965e06e51a152 Fixes: QDS-1210 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Implement better camera navigation in 3D edit viewMiikka Heikkinen2019-11-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-212-0/+6
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/autotest/testresultspane.cpp src/plugins/cmakeprojectmanager/cmaketool.cpp Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
| * QmlDesigner: Implement proper helper grid for 3D edit viewMiikka Heikkinen2019-11-182-0/+3
| | | | | | | | | | | | | | Change-Id: I9e33218d4b1528610155c5fb9bf94a9597ee23df Fixes: QDS-1204 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Implement DnD 3D objects from the item library to the EditView3DMahmoud Badri2019-11-122-0/+3
| | | | | | | | | | | | | | | | | | | | 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>
* | C++: Fix build with BUILD_CPLUSPLUS_TOOLSNikolai Kosjar2019-11-203-3/+4
| | | | | | | | | | Change-Id: If55b14f82752e19f536429ee44688156cd0a84da Reviewed-by: hjk <hjk@qt.io>
* | clangbackend: Fix typoMitja Kleider2019-11-191-1/+1
| | | | | | | | | | Change-Id: Ibc4a97e31f77423f6c2f046d83d4cba3a6d1f9c8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Use HostOsInfo::withExecutableSuffix instead of if/elseAlessandro Portale2019-11-141-11/+2
| | | | | | | | | | | | | | Let's use our Utils. Change-Id: I8cfbce55d2b41e42e86d050433df2cfd20cebe1b Reviewed-by: hjk <hjk@qt.io>
* | qml2puppet: Fix dependency in CMakeLists.txtAlessandro Portale2019-11-141-1/+1
| | | | | | | | | | | | | | | | "Qt5::Quick3" -> "Qt5::Quick3" Change-Id: I8961cc319816c8a1912d577d577c12e5bd51bd9a Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Fix compile before current Qt devChristian Stenger2019-11-122-2/+5
| | | | | | | | | | | | | | Amends 0120e462b268957171d8542b72b0ffb4a8777f7b. Change-Id: If9f443c03009bf8728497f10c8fb81f37fa1a63d Reviewed-by: hjk <hjk@qt.io>
* | Partial compile fix for current Qt dev and/or Qt 6hjk2019-11-123-2/+4
| | | | | | | | | | | | | | | | This does not cover Utils::MapReduceOption with QVector, and code that's not compiled on my machine. Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-112-0/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/genericprojectmanager/genericprojectplugin.cpp src/plugins/projectexplorer/environmentaspect.cpp src/plugins/projectexplorer/environmentaspect.h src/plugins/projectexplorer/environmentaspectwidget.cpp Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
| * QmlDesigner: Implement camera frustum visualization for edit 3DMiikka Heikkinen2019-11-112-0/+3
| | | | | | | | | | | | | | Task-number: QDS-1208 Change-Id: I3241fcdc68d01666a2536df32f170cd898cbd7af Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-043-0/+5
|\| | | | | | | Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
| * Simplify RPATHs for qmake buildEike Ziller2019-11-043-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use central rpath.pri for setting RPATHs and qttestrpath.pri for tests. Simplify install names of plugins and libraries on macOS to be just @rpath/libName, which follows convention better and makes setting up RPATHs easier. Preparation for moving tools one directory level down on macOS, to be able to add a qt.conf for the tools generically. Task-number: QTCREATORBUG-23120 Change-Id: I16625d48904abd3a7f4c2ad7bbba5916cdc400cd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-011-1/+1
|\| | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
| * CMake: Configure fix for qtcdebuggerCristian Adam2019-10-281-1/+1
| | | | | | | | | | Change-Id: Ie7921fd37c60876c91e5009cd48f16ff69ba8674 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-10-282-0/+3
|\| | | | | | | Change-Id: I66389d88d5a60c6c86547b93cca945af42aa807b
| * QmlDesigner: Add support for move gadget to 3D edit viewMiikka Heikkinen2019-10-252-0/+3
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-10-232-0/+22
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp src/plugins/qtsupport/qtversionmanager.cpp Change-Id: I2f29dd2e86b028be46184b12ac2c17ace2513d5a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 11:59:42 +0000