Commit Graph

7857 Commits

Author SHA1 Message Date
Miikka Heikkinen
327821220c QmlDesigner: Add handles to light gizmo for adjusting area light
Change-Id: Ic12bd6f5ec8800d7a42064247eecbb742ebea40c
Fixes: QDS-2040
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:12:55 +00:00
Miikka Heikkinen
e4b2e45ea6 QmlDesigner: Implement spotlight drag handles
Inner cone visualization for spotlight was added, as well as drag
handles to adjust inner and outer cone angles and fade.

Fade handle adjusts fades in order: quadratic, linear, constant.
If a specific fade value is zero, the next one in list is chosen
for adjustment.

Change-Id: I921936d9782de511558bc6c24cfa0953cce494f0
Fixes: QDS-2038
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:12:32 +00:00
Miikka Heikkinen
387657b83a QmlDesigner: Add missing camera plane ring to point light model
Task-number: QDS-2037
Change-Id: Ica5a7ec2983da251d2ab75565120423288de27a2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:10:58 +00:00
Miikka Heikkinen
3d162524e4 QmlDesigner: Add brightness control to light gizmo
Brightness can be controlled by dragging on the brightness indicator
arrow of the light gizmo in 3D edit view.

Change-Id: I317f5ee08b59bcc0bebf3fdf59861df15ef13c84
Fixes: QDS-2039
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:09:55 +00:00
Miikka Heikkinen
a3e6e24427 QmlDesigner: Update light gizmos
Directional light model was made constant size, as it doesn't have
actual physical presence.

Spot light cone now shows the cone angle correctly and the length of
the cone is calculated so that 5% of the brightness reaches the
center of the cone bottom.

Area light rectangle matches the area of the light.

Point light mesh changed to three perpendicular circles.
Same formula for size of the circles used as for spotlight length.

All light types share a common brightness indicator arrow.

Task-number: QDS-2037
Change-Id: I534dbcda9cfa2a7768c2537868ba83818979b250
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:09:41 +00:00
Miikka Heikkinen
4d23e6300f QmlDesigner: Update light icons
Task-number: QDS-2037
Change-Id: I0b95034f9ba9f308ba6fde82749b6cbef3f35859
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:07:39 +00:00
Eike Ziller
c644e7c80a Merge remote-tracking branch 'origin/qds-1.59'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
2020-06-08 16:04:15 +02:00
Alexis Jeandet
77d7bb5014 Meson build plugin initial support
Most basic project management is implemented:
- Project config/build
- Build options accessible to user
- Lists most build targets
- Meson and Ninja added to kit setup
- Basic project file tree with files known by Meson
- Some basic meson and ninja process output parsing
- Some project templates

Missing features, that will come later:
- Configurable project tree layout
- Locators for Meson
- Build importer
- Access to Machine files for better user fine tuning
- ...

Fixes: QTCREATORBUG-18117
Change-Id: I2811e71562c113fb0fc6b6177bcf0698fa71ef63
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-08 09:55:17 +00:00
hjk
28d34d196e Debugger: Fix QJson dumper for Qt >= 5.15
Storage is internally based on QCbor now.

Since this works better when having dumpers for QCbor values,
add those, too, for Numbers, Strings, Arrays, Maps for now.
None of the custom types.

Fixes: QTCREATORBUG-23827
Change-Id: Idf281d859aaf8556d9895646bbc091af85b34157
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-08 09:34:35 +00:00
Tim Jenssen
3db68b4aab qmldesigner: remove double command registration
Change-Id: Id37bea290c136d24551729a8edb36fab19b5bd7e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-05 14:41:32 +00:00
Cristian Adam
f392d13419 CMake: Fix for installation
With CMake 3.17-dev the install step is failing because of the symlink.

Change-Id: I012ce95f5cc61f4b5b9d6a4c48ded0f738b581f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-04 09:16:44 +00:00
Henning Gruendl
b851b71128 Fix compilation under linux
Change-Id: I3070876f0549a9fb7c3a52c5bc99638bad2d2894
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-03 09:09:38 +00:00
hjk
63655081c3 Debugger: Mark a few more sub items as expandable
... and remove some of the now implicit putNumChild() calls.
Also, adapt docs.

Change-Id: I1ab1dafada95a1703cd6a9ba5b9e7e4166b48cd9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-02 13:02:25 +00:00
hjk
090110e1d8 Debugger: Fix passexception_s_ for GDB CLI
The intention was to always show errors, as this is likely an error
in the dumpers themselves. The case of operating on uninitialized
data is rather rare in the manual use case here.

Change-Id: I08874e302b402be94f760f744e82e127855dd16f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-02 12:34:21 +00:00
hjk
e87c301787 Debugger: Fix gdb command line use of dumpers
Fixes: QTCREATORBUG-24103
Change-Id: I4a771e3694879755c46623c8f089857437eb0fb5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-02 12:04:23 +00:00
Eike Ziller
24777becb9 Plugin Wizard/GitHub: Don't assume jom to be in Qt Creator package
It is no longer part of the qtcreator.7z for master/4.13, but instead
packaged separately in the installer.
Get jom from its own download location.

Change-Id: I642da3f560087982612d25d288eb7a960103854b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-28 09:05:20 +00:00
Tim Jenssen
5b00401850 Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: If4869664ad4cbb5ec56e7c306f47d0bf0f1f075c
2020-05-27 19:02:07 +02:00
Tim Jenssen
b193892fd1 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
2020-05-27 18:59:53 +02:00
Thomas Hartmann
fd55b36b7c QmlDesigner: Increase alive timer
Change-Id: I2f3c1c95f631925f66dad2ce1f7635756edb7ae5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-26 18:14:27 +02:00
Thomas Hartmann
c8d7d44bfb QmlDesigner: Fix changePreviewImageSize
If the size is invalid set the default size.
Invalid size most likely means the setting was removed.

Change-Id: I3f1dad5bdac799673d37036099d954caab9aca19
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-26 18:14:14 +02:00
Thomas Hartmann
4896b60139 QmlDesigner: Add qRegisterMetaType for ChangePreviewImageSizeCommand
Change-Id: Ic399afc342a821f89c2559e0d2ebec942504ba61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
2020-05-26 18:14:03 +02:00
Tim Jenssen
cbd0649e3b qmlpuppet: enable the use of multilanguage database
Change-Id: I2277348ac1e6b5025e75c640da83da30294c9d10
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-26 18:12:38 +02:00
Marco Bubke
2e79e1715b QmlDesigner: Fix crash for missing registration of ChangeLanguageCommand
Change-Id: Ieef35ef5daa19615375cc4c7b2b0b62667df7b67
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-26 18:12:19 +02:00
Eike Ziller
227904d4a6 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
2020-05-26 09:00:05 +02:00
hjk
e71c0b7fe2 Debugger: Drop unnecessary use of ModuleNotFoundError
That's Python 3 only, and doesn't add value here.

Change-Id: I9b1702ea8b0b0ddb090fdfc393228b4430da0b07
Task-number: QTCREATORBUG-24004
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-25 23:53:47 +00:00
Christian Stenger
6a1d678db7 Wizards: Fix typo
Amends 829faf7eef.

Change-Id: Id09b5eca3a2c6a4a90d4402383723b8a03a59594
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-05-20 14:37:06 +00:00
Assam Boudjelthia
6bea157c9b Revert "Android: Also install LLDB from SDK"
This reverts commit 3e79c7da48.

Reason for revert: sdkmanager no longer offers lldb packages (a recent change from Google) instead it's provided within the latest NDK ndk;21.1.6352462.

Change-Id: If98ac86bb5086614d03f06e5f8c8e847bc65c0ed
Reviewed-by: hjk <hjk@qt.io>
2020-05-19 13:42:00 +00:00
Eike Ziller
8292807e0d Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
2020-05-19 15:23:16 +02:00
Assam Boudjelthia
9e31378b50 Android: use latest ndk version instead of ndk-bundle
Fixes: QTCREATORBUG-23903
Change-Id: Iae3561818d86952dad9209d55984c82498d07575
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-18 07:46:45 +00:00
hjk
c6007f5a2c Debugger: Funnel some LLDB message to the AppOutputPane
This could be extended to the other bridges, not done in this patch.

Change-Id: I620290049b7c95f8e3fb7584d4ca99a42fd343d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-18 06:47:10 +00:00
Tim Jenssen
aa79d30b83 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
2020-05-15 17:20:20 +02:00
The Qt Project
8f1be3f343 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-05-15 12:49:43 +00:00
Eike Ziller
52b7ec058b Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
2020-05-15 14:49:11 +02:00
hjk
73865034c6 Android: Use adb:// in ConnectRemote
This is apparently the right thing to do anyway and also helps to
select the right emulator or device when multiple ones are connected.

In that situation otherwise an error

  "Expected a single connected device, got instead 2 -
    try setting 'ANDROID_SERIAL'"

would occur.

Change-Id: I650a221d1a321d4dd9035411f85c7a68244c20e2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-15 11:37:35 +00:00
Marco Bubke
d2fe9da7e7 Fix \
Change-Id: I1834bb36443417212e4836c3353ee6c8f040b617
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-14 15:21:52 +00:00
Christian Stenger
dd9bed93f0 Dumper: Fix Python 3 support
Change-Id: I3b981a0418b2a407adfbdbab5f6b73176aeb588f
Reviewed-by: hjk <hjk@qt.io>
2020-05-14 13:16:13 +00:00
hjk
7a63a47ef0 Debugger: Work around for gdb reporting zero array sizes in some cases
Task-number: QTCREATORBUG-23998
Change-Id: I101d032705b66faf50260067f6aa604214f09298
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-14 10:52:18 +00:00
Michael Brüning
b84025cd3a Fix build on macOS
Commit 0e7a1e6650 was missing an
include for QDebug.

Change-Id: I34421f634c40984750daeac31eed9191a9128f87
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-13 14:55:53 +00:00
Andre Hartmann
cbb70513bf Git: Allow colorful logs
Requires Git 2.3 or higher for RGB colors.

Can be enabled for the normal or graph log
with the "Color" tool button. For the diff
log, the old behavior is kept (highlighter
is used for the "normal" log, no colors at
all for the graph log)

Fixes: QTCREATORBUG-19624
Change-Id: I8a42a7ad0ebf99ceb459355310311d702dcf9977
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-05-13 14:03:46 +00:00
hjk
a6e1894274 Debugger: Report LLDB error if bridge could not attach to process
Change-Id: Id54c0e21d7d803505b45f92ecf0a208771d10b81
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-13 09:08:18 +00:00
Tim Jenssen
03a1282bdd Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: Ic0edcce1268b9cc47c91364eeb84e3b3f7dfe134
2020-05-12 10:04:10 +02:00
Tim Jenssen
c9b5671754 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
2020-05-12 09:59:55 +02:00
Marco Bubke
0e7a1e6650 QmlDesigner: Preview size is now changeable
You can now change the preview size with
rootModelNode.setAuxiliaryData("previewSize@Internal", size);
If size is null it will use the bounding box size.

Change-Id: Icbe747ccc5a2e26e79783825d2ed94ecc640012b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 07:11:15 +00:00
hjk
ca862e3fff Debugger: Fix LLDB listing registers when no frame is selected
Change-Id: I6c3d193a2622ed07c34e68bf8b5780d55520e4f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-12 05:52:08 +00:00
Alexis Murzeau
a9aa561234 CMake: copy clang and resource files only if necessary
Uses a timestamp file in the build directory to detect when the input
changes using DEPENDS from add_custom_command.

Total copied files size sum up to more than 260 MB. This was copied at every
incremental build, even if nothing changed.

This leads to faster build, especially when the copied files are not
cached in RAM or when not using a SSD.

Change-Id: I3a0b691b961e1d8591068bacf40ae2467c8637cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-11 22:36:30 +00:00
hjk
65935ce03c Debugger: Fix startup when Python's json module is missing
Task-number: QTCREATORBUG-24004
Change-Id: I1c0563868374263f13cec3a8f40138bce71338d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-11 10:35:32 +00:00
Eike Ziller
20ef5c6de3 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
2020-05-11 11:36:22 +02:00
Sergey Belyashov
361ddf6ad5 Update Russian translation
Change-Id: I2753eb8bcbd25f6388088bdeabca1553f6e24410
Reviewed-by: Viacheslav Tertychnyi <tvk537@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2020-05-07 17:04:55 +00:00
hjk
9403c7c916 Debugger: Consolidate LLDB startup code a bit
Change-Id: I0c19a76ad6f1e7b4602b9bd2157cc6855e049402
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 15:12:33 +00:00
Alessandro Portale
5c71772fd0 Themes: Undo theme duplication. Just change the ThemeName
Until, we have a mechanism to define a default/fallback in a read-
only setting, it is better to stick to old file names rather than to
create redundant entries.

Change-Id: Ifbc78160e9c57025c66a266efab2b43646ee477a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 09:36:57 +00:00