summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | Adapt merge to master changeEike Ziller2017-11-141-1/+2
* | Merge "Merge remote-tracking branch 'origin/4.5'"Eike Ziller2017-11-1412-16/+66
|\ \
| * \ Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-11-1412-16/+66
| |\ \ | | |/
| | * TargetSetupPage: Ignore changes while ProjectImporter is updatingTobias Hunger2017-11-141-3/+3
| | * TargetSetupPage: Use old importer to clean up when switchingTobias Hunger2017-11-141-1/+2
| | * iOS: Fix missing URL scheme to fix QML profiling in iOSVikas Pachdha2017-11-141-0/+1
| | * CppTools: Fix highlighting when matching with scopeOrgad Shaneh2017-11-142-4/+33
| | * QmlDesigner: Update id in selection indicatorThomas Hartmann2017-11-131-1/+7
| | * QtSupport: Add Qt version specific feature versionsAlessandro Portale2017-11-131-0/+7
| | * Debugger: Set inferior device when attaching to running applicationDavid Schulz2017-11-134-1/+11
| | * QmlDesigner: Proper background for crumble barAlessandro Portale2017-11-131-6/+2
| | * Update qbs submoduleChristian Kandeler2017-11-131-0/+0
* | | RemoteLinux: Add an unused id argument to CustomRunConfigurationhjk2017-11-143-4/+4
* | | QmakeRunConfiguration: Use nullptr instead of 0Tobias Hunger2017-11-141-1/+1
* | | CustomExecutable: standardize RunConfiguration::initialize() signaturehjk2017-11-143-7/+5
* | | BareMetal: standardize RunConfiguration::initialize() signaturehjk2017-11-144-18/+24
* | | ProjectExplorer: Simplify IRunConfigurationFactory::clone() usehjk2017-11-1427-170/+55
* | | ScxmlEditor: Mark the plugin non-experimentalAlessandro Portale2017-11-141-1/+0
|/ /
* | ProjectExplorer: Return a reference from projectExplorerSetting()hjk2017-11-142-2/+2
* | Clang: Fix reserves for clangpathwatcherMarco Bubke2017-11-131-0/+3
* | Utils: Fix small string layout for Clang 5.0Marco Bubke2017-11-131-16/+18
* | Sqlite: Fix double throwing for resetMarco Bubke2017-11-131-2/+29
* | Debugger: Fix condition for hiding watcher's headerChristian Stenger2017-11-131-1/+1
* | TextEditor: Fix missing includeChristian Stenger2017-11-131-0/+2
* | Add function for getting DiffServiceEike Ziller2017-11-1310-16/+52
* | Make "Diff Against Current File" available in file system viewEike Ziller2017-11-131-1/+16
* | Project tree: Make code for diff against current file reusableEike Ziller2017-11-135-37/+34
* | Merge remote-tracking branch 'origin/4.5'Orgad Shaneh2017-11-1144-347/+131
|\ \ | |/
| * ProjectExplorer: Fix copying of RunConfigurationAspectshjk2017-11-1041-317/+69
| * Kill RunWorker start/stop watchdog times in case of reportFailurehjk2017-11-101-14/+51
| * RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTesterhjk2017-11-102-15/+2
| * Fix file system view layout on macOSEike Ziller2017-11-101-1/+9
* | BareMetal: Split BareMetalRunConfigurationFactoryhjk2017-11-103-23/+95
* | RemoteLinux: Split off RemoteLinuxCustomRunControlFactoryhjk2017-11-103-24/+97
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-11-0922-74/+159
|\ \ | |/
| * QmlDesigner: Remove unused functionThomas Hartmann2017-11-092-15/+0
| * AutoTest: Ask for run configuration only if neededChristian Stenger2017-11-091-28/+33
| * QmlProfiler: Reset the serverRecording flag when the connection dropsUlf Hermann2017-11-093-0/+26
| * QmlDesigner: Expose some helpers for themingThomas Hartmann2017-11-094-3/+31
| * QmlDesigner: fix replaceCssColorsTim Jenssen2017-11-091-1/+1
| * QmlDesigner: just color the backgroundTim Jenssen2017-11-091-7/+16
| * Debugger: Squash some (wrong) transition warnings on QmlEngine shutdownhjk2017-11-081-1/+4
| * Debugger: Remove public access to QmlCppEngine::m_qmlEnginehjk2017-11-082-15/+9
| * UpdateInfo: Fix crash on close while searching for updatesEike Ziller2017-11-081-1/+2
| * Debugger: Fix some state transition warningshjk2017-11-081-2/+4
| * Fix buildEike Ziller2017-11-071-1/+1
| * Update qbs submoduleChristian Kandeler2017-11-071-0/+0
| * NewDialog: Use nullptrTobias Hunger2017-11-071-8/+8
| * TargetSetupPage: Use nullptrTobias Hunger2017-11-071-7/+7
| * ProjectExplorer: QTC_ASSERT that kit * is not-nullptrTobias Hunger2017-11-071-0/+6
View Lorry Controller Status