Merge and whitespace
commit396e8bcca21af68e65c22bb8f1866c65875eeaab
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateFri 31 Jul 2015, 09:43 (11 years ago)
parentb3c4e376222adc
qml/Dash/CardGrid.qml+1−1
@@ -26,7 +26,7 @@ DashRenderer {
2626 }
2727 // hackish, relies on GenericScopeView.qml:335 tweak to detect application icons in click scope
2828 readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "icon" : "inset";
29−
29+
3030 expandedHeight: grid.totalContentHeight
3131 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
3232 collapsedItemCount: collapsedRows * grid.columns
tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
21−import Ubuntu.Components 0.1
21+import Ubuntu.Components 1.3
2222
2323
2424Rectangle {