Merge branch '5.1'
- Conflicts:
- plugins/quickopen/projectitemquickopen.cpp
- shell/settings/uiconfig.ui
Description
Description
Details
Details
- Committed
kossebau Feb 12 2017, 7:20 AM - Parents
- R33:535e9b294100: ProjectItemLineEdit: remove extra QWidget layer and fix margin
R33:0aa8ea50b4d2: i18n: do not find resources in 'tests' subdirs - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 535e9b294100 | kossebau | ProjectItemLineEdit: remove extra QWidget layer and fix margin | Feb 12 2017 | |||
| 95076a576175 | kossebau | Init m_itemTypes in constructor, to be safe | Feb 12 2017 | |||
| c45cd44bd4c7 | kossebau | Do not use full page width for spinboxes or comboboxes with fixed content | Feb 12 2017 | |||
| a653e374801c | kossebau | Remove duplicated or'ed condition | Feb 12 2017 | |||
| ea30a3e95783 | kossebau | Remove duplicated bit-or'ed flag | Feb 12 2017 | |||
| 7aa07c93de95 | D4555 | qi437103 | Fix Bug 374458 by properly blocking signals on debugger combo box | Feb 11 2017 |