37fffee · unity8 · git.iko.soy

qml/Components/Carousel.qml+1

compare with xenial

unifiedsplit

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19import "carousel.js" as CarouselJS

20+import "."

20

21

21/*! The Carousel component presents the items of a model in a carousel view. It's similar to a

22/*! The Carousel component presents the items of a model in a carousel view. It's similar to a

22 cover flow. But it stops at it's boundaries (therefore no PathView is used).

23 cover flow. But it stops at it's boundaries (therefore no PathView is used).

qml/Components/FloatingFlickable.qml+1

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20+import "."

20

21

21/*

22/*

22 A Flickable that can be put in front of the item to be flicked and

23 A Flickable that can be put in front of the item to be flicked and

qml/Components/ResponsiveGridView.qml+1

@@ -16,6 +16,7 @@

16

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19+import "."

19

20

20/*

21/*

21 Essentially a GridView

22 Essentially a GridView

qml/Components/ZoomableImage.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19−import "../Components"

19+import "."

20

21/*! \brief Zoomable for image.

22

tests/imports/check_imports.py+4

@@ -87,6 +87,7 @@ listview_pat = re.compile(r'.*\ ListView {')

87gridview_pat = re.compile(r'.*\ GridView {')

88flickable_pats = [flickable_pat, listview_pat, gridview_pat]

89unity_components_pat = re.compile(r'.*import ".*Components"')

90+components_import_pat = re.compile(r'.*import "."')

90components_path = re.compile(r'.*qml/Components.*')

91components_path = re.compile(r'.*qml/Components.*')

91

92

92def scan_for_flickable_imports(file_path, component_pats, qtquick_pat, unitycomponents_pat):

93def scan_for_flickable_imports(file_path, component_pats, qtquick_pat, unitycomponents_pat):

@@ -161,6 +162,9 @@ try:

161 if not components_path.match(path):

162 if not components_path.match(path):

162 if scan_for_flickable_imports(path, flickable_pats, quick_good_pat, unity_components_pat):

163 if scan_for_flickable_imports(path, flickable_pats, quick_good_pat, unity_components_pat):

163 found_bad_import = True

164 found_bad_import = True

165+ else:

166+ if scan_for_flickable_imports(path, flickable_pats, quick_good_pat, components_import_pat):

167+ found_bad_import = True

164

168

165except OSError as e:

169except OSError as e:

166 error("cannot create file list for \"" + dir + "\": " + e.strerror)

170 error("cannot create file list for \"" + dir + "\": " + e.strerror)