Merge branch 'rempt/T379-resource-management'
Description
Description
Details
Details
- Committed
rempt Mar 18 2020, 8:29 AM - Parents
- R37:4a41517207d8: Integrate Samsung's Air Actions
R37:ff7fa3e8751b: Merge branch 'master' into rempt/T379-resource-management - Branches
- Unknown
- Tags
- References
- refs/keep-around/16992a5ff080e9a66a06661a3e7a5ddaae47e59d
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ff7fa3e8751b | rempt | Merge branch 'master' into rempt/T379-resource-management | Mar 17 2020 | |||
14a2fdfa0b17 | tymond | Update the list of locations in KisDlgLayerStyle | Mar 17 2020 | |||
8207f32c2f03 | tymond | Add import of asl files into KisDlgLayerStyle | Mar 17 2020 | |||
b5d0c5da852a | tymond | Attempt to use persitent indeces to reselect bundles | Mar 17 2020 | |||
6168f7411c88 | tymond | Hide unnecessary columns in DlgBundleManager | Mar 17 2020 | |||
30370777a5da | tymond | Change Delete to (De)Activate bundle in DlgBundleCreator | Mar 17 2020 | |||
b153eeba9a91 | tymond | Add var for proxyModel in DlgBundleManager | Mar 17 2020 | |||
839987db4c79 | tymond | Implement (de)activating bundles in bundle manager | Mar 17 2020 | |||
3888c830bee1 | tymond | Implement importing bundle in the bundle manager | Mar 17 2020 | |||
f6103cea0d84 | tymond | Add names for buttons in Bundle Manager | Mar 17 2020 | |||
63c8677749b1 | tymond | Remove commented out code in kis_dlg_layer_style | Mar 17 2020 | |||
b12dbf970da4 | tymond | Remove resources() from kis_dlg_layer_style | Mar 17 2020 | |||
243f17b26923 | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
f6128204993d | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
53ea4c63206f | rempt | warning--: unused parameters | Mar 11 2020 | |||
55f846f0f7ae | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
77882cf057d6 | rempt | warning--: unused parameters | Mar 11 2020 | |||
756ff1af8bd1 | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
6dbe0dffffe0 | rempt | Port away from deprecated QSet::toList | Mar 11 2020 | |||
5649ed726b8a | rempt | Port away from deprecated QPalette::background | Mar 11 2020 | |||
205deb1ef2fa | rempt | Port away from deprecated QSet::toList | Mar 11 2020 | |||
2d3708a523c6 | rempt | Port away from deprecated QString::sprintf | Mar 11 2020 | |||
c3976561444d | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
e0839d3d0219 | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
2762c9d4319e | rempt | Port away from deprecated QSet::fromList | Mar 11 2020 | |||
0b7178d531c7 | rempt | Port away from deprecated QString::sprintf | Mar 11 2020 | |||
2f8a2f6ca1fc | rempt | Port away from deprecated QPalette::background | Mar 11 2020 | |||
f52ff30f346c | rempt | Port away from deprecated QString::sprintf | Mar 11 2020 | |||
94af37bd0503 | rempt | port away from deprecated QList::toSet | Mar 11 2020 | |||
a2682dfdebcb | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
ae84b8b8a4d3 | rempt | Port away from deprecated QSet::fromList | Mar 11 2020 | |||
b9861a6d4f49 | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
717ada6995ba | rempt | Port away from deprecated QList::fromSet | Mar 11 2020 | |||
a66dfb0b4ecd | rempt | Port away from deprecated QMediaObject::canonicalUrl | Mar 11 2020 | |||
633fd0abd524 | rempt | Port away from deprecated QSet::toList | Mar 11 2020 | |||
f77668de830f | rempt | warning--: unused parameters | Mar 11 2020 | |||
cc8777af2f32 | rempt | Port away from deprecated QList::fromSet and QSet::fromList | Mar 11 2020 | |||
c207dca54cf7 | rempt | Port away from deprecated QList::fromSet | Mar 11 2020 | |||
16b4f5f385bb | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
bfa59e1e781f | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
339f3975f19d | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
42b0c3521e5e | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
d07734e39b98 | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
96c3872e0a2d | rempt | warning--: unused parameters | Mar 11 2020 | |||
ca18d027f2bb | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
586ce6dfda3e | rempt | Port away from deprecated QSet::toList | Mar 11 2020 | |||
f457c4bf19fe | rempt | Port away from deprecated qVariantFromValue | Mar 11 2020 | |||
81f16fb072f7 | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
79e39a1c09c6 | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 | |||
397d6ce8cca4 | rempt | Port away from deprecated QTime to QElapsedTimer | Mar 11 2020 |