summaryrefslogtreecommitdiff
path: root/share
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-261-1/+1
|\
| * Debugger: Drop unnecessary use of ModuleNotFoundErrorhjk2020-05-251-1/+1
* | Wizards: Fix typoChristian Stenger2020-05-201-1/+1
* | Revert "Android: Also install LLDB from SDK"Assam Boudjelthia2020-05-191-1/+1
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-191-2/+2
|\ \ | |/
| * Android: use latest ndk version instead of ndk-bundleAssam Boudjelthia2020-05-181-2/+2
* | Debugger: Funnel some LLDB message to the AppOutputPanehjk2020-05-182-2/+30
* | 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
| |\ \ | | |/
| | * Debugger: Work around for gdb reporting zero array sizes in some caseshjk2020-05-142-5/+11
| | * Debugger: Fix startup when Python's json module is missinghjk2020-05-111-2/+2
* | | Android: Use adb:// in ConnectRemotehjk2020-05-151-6/+5
|/ /
* | Dumper: Fix Python 3 supportChristian Stenger2020-05-141-0/+5
* | Git: Allow colorful logsAndre Hartmann2020-05-136-0/+36
* | Debugger: Report LLDB error if bridge could not attach to processhjk2020-05-131-0/+1
* | Debugger: Fix LLDB listing registers when no frame is selectedhjk2020-05-121-14/+20
* | CMake: copy clang and resource files only if necessaryAlexis Murzeau2020-05-111-14/+5
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-114-113/+364
|\ \ | |/
| * Update Russian translationSergey Belyashov2020-05-071-45/+16
| * Themes: Undo theme duplication. Just change the ThemeNameAlessandro Portale2020-05-072-407/+1
| * Theme: add new dark and light design themesBrook Cronin2020-05-062-0/+711
| * Update designer theme to new color rolesThomas Hartmann2020-05-061-66/+41
| * Debugger: prevent calling functions on windows targetsDavid Schulz2020-05-061-1/+1
* | Debugger: Consolidate LLDB startup code a bithjk2020-05-071-32/+33
* | Debugger: Make sure to not select frame -1 with LLDBhjk2020-05-071-1/+2
* | Debugger: Make LLDB attach to local process work (again?)hjk2020-05-071-0/+6
* | Debugger: Simplify LLDB bridge startuphjk2020-05-071-9/+3
* | Debugger: Avoid race condition on setting initial LLDB breakpointshjk2020-05-071-1/+3
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-062-162/+1
|\ \ | |/
| * CMake build: Make translation function available to external pluginsEike Ziller2020-05-051-162/+0
| * QmlDesigner: Add a missing import to the PropertyEditor ThemeAlessandro Portale2020-05-051-0/+1
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-049-47/+271
|\ \ | |/
| * Theme: add controls theme to creator themes and map to controls theme valuesBrook Cronin2020-04-306-47/+220
| * CMake build/Linux: Install desktop and appstream filesEike Ziller2020-04-303-0/+51
* | Merge remote-tracking branch 'origin/qds-1.59'Tim Jenssen2020-04-2821-115/+889
|\ \
| * \ Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-283-36/+64
| |\ \ | | |/
| * | QmlDesigner: Add Combo box for statesThomas Hartmann2020-04-271-3/+6
| * | QmlDesigner: Update properties in property editorHenning Gruendl2020-04-2710-8/+715
| * | QmlDesigner: Extend icon font supportThomas Hartmann2020-04-274-95/+134
| * | QmlDesigner: Add fontStyle supportThomas Hartmann2020-04-241-0/+19
| * | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-242-2/+7
| |\ \
| * | | QmlDesigner: Add "closeup" option to focusObjectToCamera functionMiikka Heikkinen2020-04-246-9/+13
| * | | QmlDesigner: Update UI when an asset is reimportedMiikka Heikkinen2020-04-231-0/+2
* | | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-283-36/+64
|\ \ \ \ | | |_|/ | |/| |
| * | | CMake build: Fix copying & installation of resourcesEike Ziller2020-04-281-9/+26
| * | | Debugger: Fix STL map size bug on WindowsJeremy Ephron2020-04-281-1/+2
| * | | QmlDesigner: Fix ComboBox for raw stringsThomas Hartmann2020-04-241-26/+36
| | |/ | |/|
* | | share: Remove qtcreator/welcomescreenAlessandro Portale2020-04-282-95/+0
* | | QmlPuppet: Fix buildTobias Hunger2020-04-271-1/+1
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-241-1/+3
|\ \ \ | |/ /