aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.14' into masterEike Ziller2020-10-2189-1107/+1025
|\
| * Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-216-24/+26
| |\
| | * Squish: Update tst_codepastingRobert Loehning2020-10-201-1/+1
| | * ProjectExplorer: Fix sorting predicate to have a strict weak orderAlexandru Croitor2020-10-201-3/+11
| | * Fix github actions for Qt Creator plugin wizardEike Ziller2020-10-194-20/+14
| * | Editor: Do not use disabled code color for right margin highlightDavid Schulz2020-10-211-5/+9
| * | QmlDesigner: Port 3D edit view to Qt6Miikka Heikkinen2020-10-2035-180/+740
| * | Update Qbs to HEAD of masterEike Ziller2020-10-201-0/+0
| * | CMake Build: Allow building unittests when targets are missingCristian Adam2020-10-202-15/+22
| * | CMake Build: Make sure testplugin target exists before setting propertyCristian Adam2020-10-201-1/+3
| * | CppEditor: Fix some "convert to camel case" edge casesChristian Kandeler2020-10-205-20/+76
| * | QmlDesigner: Add missing includeRobert Loehning2020-10-201-0/+2
| * | QmlDesigner: Remove SwitchsplittabwidgetMahmoud Badri2020-10-207-284/+0
| * | QmlDesigner: Fix incorrect conversion between double and int/longEike Ziller2020-10-201-1/+1
| * | Fix compilation of sdktool against old Qt versionsEike Ziller2020-10-201-0/+7
| * | QmlDesigner: Remove AnnotationToolMahmoud Badri2020-10-207-373/+0
| * | Tests: Fix compile and codeChristian Stenger2020-10-202-7/+8
| * | ClangRefactoringBackend: Fix build with Clang 11Cristian Adam2020-10-202-0/+2
| * | Revert "Editor: Make line spacing adjustable"David Schulz2020-10-208-199/+86
| * | Editor: fix completion character completionsDavid Schulz2020-10-191-2/+3
| * | LanguageClient: pass id as a const ref when handling client messagesDavid Schulz2020-10-195-10/+10
| * | Unittest: Fix qbs buildChristian Kandeler2020-10-191-13/+0
| * | CurveEditor: Fix bounding rect computation for the graphicssceneKnud Dollereder2020-10-198-10/+56
| * | More change log for 4.14Eike Ziller2020-10-191-0/+11
* | | TextEditor: Support highlighter results that cross block boundariesChristian Kandeler2020-10-201-49/+54
* | | Merge remote-tracking branch 'origin/4.14' into masterEike Ziller2020-10-19247-701/+6127
|\| |
| * | CMake build: Fix build of QmlDesignerEike Ziller2020-10-191-0/+10
| * | Utils: Fix matching wildcards to full pathsChristian Stenger2020-10-194-2/+75
| * | QmlDesigner: Fix reversed order on Navigator dropHenning Gruendl2020-10-191-3/+3
| * | Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-194-14/+42
| |\|
| | * Automatic generation of Description & Display Condition tabLukasz Ornatek2020-10-162-7/+27
| | * qmlpreview: fix calling right localeIsoCode methodTim Jenssen2020-10-142-7/+15
| * | Remove invisible translated stringsRobert Loehning2020-10-197-21/+0
| * | CMake Build: Fix missing pythonXY.zip on MSVCCristian Adam2020-10-192-6/+100
| * | ClangCodeModel: Use a configurable timeout in the testsChristian Kandeler2020-10-193-13/+17
| * | LanguageClient: Generate BaseMessage only once per send contentDavid Schulz2020-10-191-4/+3
| * | QmlDesigner: Fix qbs buildChristian Stenger2020-10-191-0/+5
| * | TextEditor: fix selection highlightDavid Schulz2020-10-191-1/+2
| * | Android: fix aab label name and supported versionsAssam Boudjelthia2020-10-162-2/+3
| * | QmakeProjectManager: Make "system" execution opt-inChristian Kandeler2020-10-169-8/+65
| * | QmlDesigner: Add image cacheMarco Bubke2020-10-16111-237/+4403
| * | QmlDesigner: Sort items in FileResourceModelHenning Gruendl2020-10-162-10/+29
| * | Android: Aspectify AndroidDeployQtStephjk2020-10-162-53/+18
| * | Debugger: Use -file-symbol-file for core files with GDBhjk2020-10-161-1/+1
| * | AutoTest: Prefer active target over furtherChristian Stenger2020-10-161-2/+5
| * | QmlDesigner: Fix recent regressionThomas Hartmann2020-10-151-0/+4
| * | QmlDesigner: Fix UrlChooserThomas Hartmann2020-10-151-1/+1
| * | Account for qmake.bat script for Qt 6 targetsAssam Boudjelthia2020-10-151-1/+7
| * | ClangTools: Further increase the test timeoutChristian Kandeler2020-10-152-1/+10
| * | QmlDesigner: Fix compile of testsChristian Stenger2020-10-151-2/+15