git.iko.soy/unity8
on xenial help sign in
added imports for components
commit37fffee15be8e7625b0418c5263df2aea6e93a40 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 8 Aug 2016, 11:41 (10 years ago) parent59f23fd
5 files changed+8−1
compare with xenial
unifiedsplit
qml/Components/Carousel.qml+1 qml/Components/FloatingFlickable.qml+1 qml/Components/ResponsiveGridView.qml+1 qml/Components/ZoomableImage.qml+1−1 tests/imports/check_imports.py+4
qml/Components/Carousel.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "carousel.js" as CarouselJS
20+import "."
2021
2122/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
2223 cover flow. But it stops at it's boundaries (therefore no PathView is used).
qml/Components/FloatingFlickable.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
20+import "."
2021
2122/*
2223 A Flickable that can be put in front of the item to be flicked and
qml/Components/ResponsiveGridView.qml+1
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
19+import "."
1920
2021/*
2122 Essentially a GridView
qml/Components/ZoomableImage.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
19−import "../Components"
19+import "."
2020
2121/*! \brief Zoomable for image.
2222
tests/imports/check_imports.py+4
@@ -87,6 +87,7 @@ listview_pat = re.compile(r'.*\ ListView {')
8787gridview_pat = re.compile(r'.*\ GridView {')
8888flickable_pats = [flickable_pat, listview_pat, gridview_pat]
8989unity_components_pat = re.compile(r'.*import ".*Components"')
90+components_import_pat = re.compile(r'.*import "."')
9091components_path = re.compile(r'.*qml/Components.*')
9192
9293def scan_for_flickable_imports(file_path, component_pats, qtquick_pat, unitycomponents_pat):
@@ -161,6 +162,9 @@ try:
161162 if not components_path.match(path):
162163 if scan_for_flickable_imports(path, flickable_pats, quick_good_pat, unity_components_pat):
163164 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
164168
165169except OSError as e:
166170 error("cannot create file list for \"" + dir + "\": " + e.strerror)