git.iko.soy/unity8
on xenial help sign in
Merge
141d911Albert Astals
cmake/modules/QmlTest.cmake+2−2
compare with xenial
unifiedsplit
@@ -135,7 +135,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
135 set(testCommand
135 set(testCommand
136 LD_LIBRARY_PATH=${LD_PATH}
136 LD_LIBRARY_PATH=${LD_PATH}
137 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
137 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
138− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
138+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
139 -o -,txt)
139 -o -,txt)
140
140
141 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
141 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
@@ -151,7 +151,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
151 LD_LIBRARY_PATH=${LD_PATH}
151 LD_LIBRARY_PATH=${LD_PATH}
152 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
152 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
153 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
153 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
154− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
154+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
155 -o -,txt)
155 -o -,txt)
156
156
157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
plugins/Dash/CardCreator.js−1
@@ -608,7 +608,6 @@ function cardString(template, components) {
608function createCardComponent(parent, template, components) {
608function createCardComponent(parent, template, components) {
609 var imports = 'import QtQuick 2.2; \n\
609 var imports = 'import QtQuick 2.2; \n\
610 import Ubuntu.Components 0.1; \n\
610 import Ubuntu.Components 0.1; \n\
611− import Ubuntu.Thumbnailer 0.1;\n\
612 import Dash 0.1;\n';
611 import Dash 0.1;\n';
613 var card = cardString(template, components);
612 var card = cardString(template, components);
614 var code = imports + 'Component {\n' + card + '}\n';
613 var code = imports + 'Component {\n' + card + '}\n';
qml/Dash/DashApplication.qml+1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.0
18import Ubuntu.Components 1.0
19+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
19
20
20MainView {
21MainView {
21 width: units.gu(40)
22 width: units.gu(40)
qml/ScopeTool.qml+1
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Components.Popups 0.1
19import Ubuntu.Components.Popups 0.1
20+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
20import Utils 0.1
21import Utils 0.1
21import Unity 0.2
22import Unity 0.2
22import "Components"
23import "Components"