Merge remote-tracking branch 'origin/5.0'
Description
Description
Details
Details
- Committed
kfunk Mar 1 2016, 6:26 PM - Differential Revision
- D2701: Process QML runtime errors
- Parents
- R32:b3ec36eb90a9: Make compile
R32:b514586da51e: Merge branch '5.0' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
b3ec36eb90a9 | kfunk | Make compile | Mar 1 2016 | |||
d3edcf1245e3 | zwabel | fix selection of active function/class in the outline view | Mar 1 2016 | |||
3da0892440ab | apol | Remove unused attributes | Feb 29 2016 | |||
704ea3ccf608 | apol | We're using dynamic_cast, just check it first | Feb 29 2016 | |||
98c3af1d9d3e | apol | Prevent null pointer invocation | Feb 29 2016 | |||
f1c8b703aebe | apol | Make sure we're not adding null projects | Feb 29 2016 | |||
f290393a3834 | apol | Don't call toLocalFile without checking if it's actually a local file | Feb 29 2016 | |||
12b11bf42efa | apol | Make it possible to use QDebug with VcsStatusInfo | Feb 29 2016 | |||
3676282e0dba | apol | Make sure the urls we provide are clean | Feb 29 2016 | |||
ab140516c288 | apol | Prefer splitting strings into QStringRef | Feb 29 2016 | |||
9a8441419e1e | mwolff | QMap -> QHash for pointer type as key. | Feb 21 2016 | |||
701d2c173a43 | mwolff | Fix quadratic behavior of updateAllTabColors/Container::setTabcolors. | Feb 21 2016 | |||
e9d541cfcc92 | mwolff | return empty QString instead of empty QLatin1String. | Feb 21 2016 | |||
a844b07d1692 | mwolff | Fix warning in unit test: Could not remove our own lock file. | Feb 21 2016 | |||
864af3fa7f05 | mwolff | Minor code cleanup regarding string usage. | Feb 21 2016 | |||
3e3bc253c6d6 | mwolff | Don't blindly connect to potential nullptr to prevent warning. | Feb 21 2016 | |||
3d0cd909d0de | D997 | mwolff | Do not try to cleanup the DUChain while parse jobs are running. | Feb 21 2016 |