summaryrefslogtreecommitdiff
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-261-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
| * Debugger: Drop unnecessary use of ModuleNotFoundErrorhjk2020-05-251-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Wizards: Fix typoChristian Stenger2020-05-201-1/+1
| | | | | | | | | | | | | | Amends 829faf7eefbf. Change-Id: Id09b5eca3a2c6a4a90d4402383723b8a03a59594 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Revert "Android: Also install LLDB from SDK"Assam Boudjelthia2020-05-191-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 3e79c7da48b6add98ffa78b428c74121cddecd95. 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>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-191-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/android/androidextralibrarylistmodel.cpp Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
| * Android: use latest ndk version instead of ndk-bundleAssam Boudjelthia2020-05-181-2/+2
| | | | | | | | | | | | Fixes: QTCREATORBUG-23903 Change-Id: Iae3561818d86952dad9209d55984c82498d07575 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Debugger: Funnel some LLDB message to the AppOutputPanehjk2020-05-182-2/+30
| | | | | | | | | | | | | | This could be extended to the other bridges, not done in this patch. Change-Id: I620290049b7c95f8e3fb7584d4ca99a42fd343d4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.12'"The Qt Project2020-05-152-7/+13
|\ \
| * \ Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-152-7/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/mcusupport/mcusupportsdk.cpp Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
| | * Debugger: Work around for gdb reporting zero array sizes in some caseshjk2020-05-142-5/+11
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-23998 Change-Id: I101d032705b66faf50260067f6aa604214f09298 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * Debugger: Fix startup when Python's json module is missinghjk2020-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Android: Use adb:// in ConnectRemotehjk2020-05-151-6/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Dumper: Fix Python 3 supportChristian Stenger2020-05-141-0/+5
| | | | | | | | | | Change-Id: I3b981a0418b2a407adfbdbab5f6b73176aeb588f Reviewed-by: hjk <hjk@qt.io>
* | Git: Allow colorful logsAndre Hartmann2020-05-136-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Debugger: Report LLDB error if bridge could not attach to processhjk2020-05-131-0/+1
| | | | | | | | | | Change-Id: Id54c0e21d7d803505b45f92ecf0a208771d10b81 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Debugger: Fix LLDB listing registers when no frame is selectedhjk2020-05-121-14/+20
| | | | | | | | | | Change-Id: I6c3d193a2622ed07c34e68bf8b5780d55520e4f2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMake: copy clang and resource files only if necessaryAlexis Murzeau2020-05-111-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-114-113/+364
|\ \ | |/ | | | | Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
| * Update Russian translationSergey Belyashov2020-05-071-45/+16
| | | | | | | | | | | | Change-Id: I2753eb8bcbd25f6388088bdeabca1553f6e24410 Reviewed-by: Viacheslav Tertychnyi <tvk537@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * Themes: Undo theme duplication. Just change the ThemeNameAlessandro Portale2020-05-072-407/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * Theme: add new dark and light design themesBrook Cronin2020-05-062-0/+711
| | | | | | | | | | | | Change-Id: Ibc65528694d5b8e55e17a80ecd82497c4ab98499 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Update designer theme to new color rolesThomas Hartmann2020-05-061-66/+41
| | | | | | | | | | Change-Id: I39ece78e3961d6c2705abcdefcffc4b9cdd8e704 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Debugger: prevent calling functions on windows targetsDavid Schulz2020-05-061-1/+1
| | | | | | | | | | | | | | | | This will result in a crashing gdb. Fixes: QTCREATORBUG-23982 Change-Id: I59b65c5854bb4b7cbd59522a555388d1e833a560 Reviewed-by: hjk <hjk@qt.io>
* | Debugger: Consolidate LLDB startup code a bithjk2020-05-071-32/+33
| | | | | | | | | | Change-Id: I0c19a76ad6f1e7b4602b9bd2157cc6855e049402 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Make sure to not select frame -1 with LLDBhjk2020-05-071-1/+2
| | | | | | | | | | | | | | | | | | 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>
* | Debugger: Make LLDB attach to local process work (again?)hjk2020-05-071-0/+6
| | | | | | | | | | Change-Id: I48ec7b5251db490d1c8e17affb3c1dc1ce22bece Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Simplify LLDB bridge startuphjk2020-05-071-9/+3
| | | | | | | | | | | | | | | | 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>
* | Debugger: Avoid race condition on setting initial LLDB breakpointshjk2020-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-062-162/+1
|\ \ | |/ | | | | Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
| * CMake build: Make translation function available to external pluginsEike Ziller2020-05-051-162/+0
| | | | | | | | | | | | | | 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>
| * QmlDesigner: Add a missing import to the PropertyEditor ThemeAlessandro Portale2020-05-051-0/+1
| | | | | | | | | | | | Change-Id: I4b6151b1e12311334a0c32e2fa6f7c30db150c92 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-049-47/+271
|\ \ | |/ | | | | Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
| * Theme: add controls theme to creator themes and map to controls theme valuesBrook Cronin2020-04-306-47/+220
| | | | | | | | | | Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * CMake build/Linux: Install desktop and appstream filesEike Ziller2020-04-303-0/+51
| | | | | | | | | | | | Fixes: QTCREATORBUG-23906 Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59'Tim Jenssen2020-04-2821-115/+889
|\ \ | | | | | | | | | Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
| * \ Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-283-36/+64
| |\ \ | | |/ | | | | | | Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
| * | QmlDesigner: Add Combo box for statesThomas Hartmann2020-04-271-3/+6
| | | | | | | | | | | | | | | | | | Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Update properties in property editorHenning Gruendl2020-04-2710-8/+715
| | | | | | | | | | | | | | | | | | | | | | | | Add missing and cleanup existing properties in property editor. Task-number: QDS-1502 Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Extend icon font supportThomas Hartmann2020-04-274-95/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | QmlDesigner: Add fontStyle supportThomas Hartmann2020-04-241-0/+19
| | | | | | | | | | | | | | | | | | Task-number: QDS-1884 Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-242-2/+7
| |\ \ | | | | | | | | | | | | Change-Id: If491fa41c07b9159d1755ef0580b4af6f6ca7d65
| * | | QmlDesigner: Add "closeup" option to focusObjectToCamera functionMiikka Heikkinen2020-04-246-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | QmlDesigner: Update UI when an asset is reimportedMiikka Heikkinen2020-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Item library thumbnail and navigator icon are refreshed if asset is reimported, and the puppet is restarted in case the asset is in use. Change-Id: Ic5577eff3a24bcce87b504e9c059c29f6cb887a5 Fixes: QDS-1957 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-283-36/+64
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
| * | | CMake build: Fix copying & installation of resourcesEike Ziller2020-04-281-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | Debugger: Fix STL map size bug on WindowsJeremy Ephron2020-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | QmlDesigner: Fix ComboBox for raw stringsThomas Hartmann2020-04-241-26/+36
| | |/ | |/| | | | | | | | | | | | | Change-Id: Ie35bda95290042f2faaf938ee67b6ee02e8c55b1 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | share: Remove qtcreator/welcomescreenAlessandro Portale2020-04-282-95/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | QmlPuppet: Fix buildTobias Hunger2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | You can not use a variable in a lambda without capturing it. Change-Id: Iada3e40c70c0584c82a5c95a40f64164ca533aed Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-241-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakekitinformation.cpp Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
View Lorry Controller Status