Eike Ziller ae6c974fb2 Merge remote-tracking branch 'origin/7.0' ...

Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0

2022-03-23 14:16:07 +01:00

..

android

Android: keep up with sdk tools changing folder structure

2022-03-17 20:45:07 +00:00

cplusplus

Make share/qtcreator/cplusplus/examples compilable

2022-02-04 16:21:21 +00:00

debugger

Debugger: Add dumper for qdump__boost__container__devector

2022-01-31 07:48:06 +00:00

glsl

GlslEditor: Update language spec

2020-07-17 04:45:01 +00:00

indexer_preincludes

CMake: Fix for installation

2020-06-12 17:33:43 +00:00

modeleditor

modeleditor: Intersect relations with shape of item

2020-02-25 19:21:48 +00:00

qml/qmlpuppet

QmlDesigner: Don't scan for fonts if resource path is not valid

2022-03-18 11:27:35 +00:00

qml-type-descriptions

Update qbs submodule

2022-02-17 09:18:12 +00:00

qmldesigner

QmlDesigner: Fix DirectoryFontLoader

2022-03-22 17:03:54 +00:00

qmlicons

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

schemes

…

scripts

macOS: use string array to be compatible with both bash and zsh

2022-02-08 08:04:18 +00:00

snippets

ProjectExplorer: Clean up variables

2020-10-02 07:49:08 +00:00

styles

TextEditor: Add highlighting category for namespaces

2021-10-29 08:36:20 +00:00

templates

Wizard: Fix misspelling

2022-03-23 11:41:32 +00:00

themes

QmlDesigner: Fix design themes for alternating rows

2022-03-10 10:20:48 +00:00

translations

Android: Fix punctuation and wording of messages

2022-02-18 07:27:41 +00:00

CMakeLists.txt

cmake build: Fix permissions of scripts in installation

2020-11-11 16:30:49 +00:00