Commit Graph

6016 Commits

Author SHA1 Message Date
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
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
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
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
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
hjk
310c954779 Debugger: Make sure to not select frame -1 with LLDB
This can appear as (non-existing) preferred frame index in backtraces
consisting only of frames without debug info. Fall back to top most
frame in that case.

Change-Id: Id7bb941d5fc3080aff3853cebb7b92afdd0ba4ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 09:04:28 +00:00
hjk
54dd137902 Debugger: Make LLDB attach to local process work (again?)
Change-Id: I48ec7b5251db490d1c8e17affb3c1dc1ce22bece
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 08:02:44 +00:00
hjk
e73f05253e Debugger: Simplify LLDB bridge startup
No need to start the debugger event loop if the engine setup fails

Change-Id: I6bdeda0d2609c79aa5fafff7bc4b373a0bf14fbd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 07:39:29 +00:00
hjk
2dfa539b96 Debugger: Avoid race condition on setting initial LLDB breakpoints
Breakpoints inserting is async, so they did end up when the process
was running already.

This adds an extra roundtrip. Better, but more intrusive solution
might be to set the initial breakpoints synchronously, but that
would touch all engines.

Change-Id: Ia728a9c5ae8f1d6d29d3cc02b9e2d04952091fe9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 07:12:46 +00:00
Brook Cronin
559df59907 Theme: add new dark and light design themes
Change-Id: Ibc65528694d5b8e55e17a80ecd82497c4ab98499
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:15:43 +00:00
Thomas Hartmann
3c0cd3baca Update designer theme to new color roles
Change-Id: I39ece78e3961d6c2705abcdefcffc4b9cdd8e704
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-06 15:59:18 +00:00
David Schulz
04da8f4178 Debugger: prevent calling functions on windows targets
This will result in a crashing gdb.

Fixes: QTCREATORBUG-23982
Change-Id: I59b65c5854bb4b7cbd59522a555388d1e833a560
Reviewed-by: hjk <hjk@qt.io>
2020-05-06 12:55:49 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Eike Ziller
cc04c8d8e4 CMake build: Make translation function available to external plugins
And fix that the "ts_all" target did not get the custom target prefix.

Change-Id: Iff6a5e328456f3d949c31f2e41b48c400fad773c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-05-05 09:48:31 +00:00
Alessandro Portale
67828b4fe5 QmlDesigner: Add a missing import to the PropertyEditor Theme
Change-Id: I4b6151b1e12311334a0c32e2fa6f7c30db150c92
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-05 07:03:32 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
2020-05-04 10:52:34 +02:00
Brook Cronin
96cd1bffae Theme: add controls theme to creator themes and map to controls theme values
Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-30 15:43:45 +00:00
Eike Ziller
d7520dece5 CMake build/Linux: Install desktop and appstream files
Fixes: QTCREATORBUG-23906
Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-30 07:06:20 +00:00
Tim Jenssen
53d161c98e Merge remote-tracking branch 'origin/qds-1.59'
Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
2020-04-28 16:18:24 +02:00
Eike Ziller
e9661e43cb Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
2020-04-28 15:48:36 +02:00
Alessandro Portale
6efed7140b share: Remove qtcreator/welcomescreen
Left-over from when the welcome screen was still implemented in qml.

Change-Id: I94c187d820440568e198f1fcaa09f67d2c688bcf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 11:08:37 +00:00
Tim Jenssen
6c2ae3519e Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
2020-04-28 11:53:38 +02:00
Eike Ziller
fc94174bf7 CMake build: Fix copying & installation of resources
- just copy & install whole directories, like the qmake build (basically)
- copy & install scripts/ only on macOS
- do not copy or install welcomescreen/ which is no longer used

Fixes: QTCREATORBUG-23907
Fixes: QTCREATORBUG-23909
Fixes: QTCREATORBUG-23911
Change-Id: I0f9016848d15b214c40f454f39c5560d1faa4f32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-28 08:50:51 +00:00
Jeremy Ephron
7982c440d5 Debugger: Fix STL map size bug on Windows
Fixed a bug in obtaining the size of STL map with MinGW 32/64. Retrieved
the size directly rather than unpacking the size from the data (which
is not present in on Windows). Tested for compatibility with LLVM/LLDB
on macOS.

Change-Id: I4d836d6288465e82d694de0405965586683c1355
Reviewed-by: hjk <hjk@qt.io>
2020-04-28 08:25:04 +00:00
Tobias Hunger
9f92acf223 QmlPuppet: Fix build
You can not use a variable in a lambda without capturing it.

Change-Id: Iada3e40c70c0584c82a5c95a40f64164ca533aed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 18:47:34 +00:00
Thomas Hartmann
4435a19979 QmlDesigner: Add Combo box for states
Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 11:21:14 +00:00
Henning Gruendl
104852e09d QmlDesigner: Update properties in property editor
Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 08:47:57 +00:00
Thomas Hartmann
9c17fd0dbe QmlDesigner: Extend icon font support
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update icon font and related constants

Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 08:47:31 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
2020-04-24 13:58:05 +02:00
Thomas Hartmann
d5ac552314 QmlDesigner: Fix ComboBox for raw strings
Change-Id: Ie35bda95290042f2faaf938ee67b6ee02e8c55b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:42:13 +00:00
Thomas Hartmann
0222630012 QmlDesigner: Add fontStyle support
Task-number: QDS-1884
Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:35:28 +00:00
Tim Jenssen
93ef6afff9 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: If491fa41c07b9159d1755ef0580b4af6f6ca7d65
2020-04-24 13:17:03 +02:00
Miikka Heikkinen
d1a7afa28f QmlDesigner: Add "closeup" option to focusObjectToCamera function
The closeup option is used for itemlibrary thumbnail generation, where
the regular fit produces too small images on most imports.

Change-Id: I2901a2e20d100b155111f002b22489df945e9e01
Fixes: QDS-1899
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-24 10:29:43 +00:00
Thomas Hartmann
bbed542ec3 QmlDesigner: Expose typeFilter property
Change-Id: Iaf0c6db67eb25b730bc31f87b52b0ec93ab15266
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 17:22:00 +00:00