1
=== modified file 'modules/Ubuntu/Components/deployment.pri'
2
--- modules/Ubuntu/Components/deployment.pri	2013-09-25 13:47:49 +0000
3
+++ modules/Ubuntu/Components/deployment.pri	2014-01-20 16:27:44 +0000
4
@@ -44,6 +44,9 @@
5
44
44
6
45
plugins_qmltypes.path = $$installPath
45
plugins_qmltypes.path = $$installPath
7
46
plugins_qmltypes.files = plugins.qmltypes
46
plugins_qmltypes.files = plugins.qmltypes
9
47
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Components 0.1 ../../ > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
47
# Silence spam on stderr due to fonts
10
48
# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
11
49
# https://bugreports.qt-project.org/browse/QTBUG-36243
12
50
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Components 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
13
48
51
14
49
INSTALLS += qmldir_file qml_files js_files artwork_files listitems_files listitems_artwork_files popups_files picker_files plugins_qmltypes
52
INSTALLS += qmldir_file qml_files js_files artwork_files listitems_files listitems_artwork_files popups_files picker_files plugins_qmltypes
15
50
53
16
=== modified file 'modules/Ubuntu/Layouts/deployment.pri'
17
--- modules/Ubuntu/Layouts/deployment.pri	2013-12-09 16:26:24 +0000
18
+++ modules/Ubuntu/Layouts/deployment.pri	2014-01-20 16:27:44 +0000
19
@@ -13,6 +13,9 @@
20
13
13
21
14
plugins_qmltypes.path = $$installPath
14
plugins_qmltypes.path = $$installPath
22
15
plugins_qmltypes.files = plugins.qmltypes
15
plugins_qmltypes.files = plugins.qmltypes
24
16
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Layouts 0.1 ../../ > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
16
# Silence spam on stderr due to fonts
25
17
# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
26
18
# https://bugreports.qt-project.org/browse/QTBUG-36243
27
19
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Layouts 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
28
17
20
29
18
INSTALLS += qmldir_file plugins_qmltypes
21
INSTALLS += qmldir_file plugins_qmltypes
30
19
22
31
=== modified file 'modules/Ubuntu/Test/deployment.pri'
32
--- modules/Ubuntu/Test/deployment.pri	2013-07-24 12:34:45 +0000
33
+++ modules/Ubuntu/Test/deployment.pri	2014-01-20 16:27:44 +0000
34
@@ -15,6 +15,9 @@
35
15
15
36
16
plugins_qmltypes.path = $$installPath
16
plugins_qmltypes.path = $$installPath
37
17
plugins_qmltypes.files = plugins.qmltypes
17
plugins_qmltypes.files = plugins.qmltypes
39
18
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
18
# Silence spam on stderr due to fonts
40
19
# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
41
20
# https://bugreports.qt-project.org/browse/QTBUG-36243
42
21
plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
43
19
22
44
20
INSTALLS += qmldir_file plugins_qmltypes
23
INSTALLS += qmldir_file plugins_qmltypes
45
21
24
46
=== modified file 'tests/unit/add_qmlmakecheck.pri'
47
--- tests/unit/add_qmlmakecheck.pri	2013-12-13 15:50:35 +0000
48
+++ tests/unit/add_qmlmakecheck.pri	2014-01-20 16:27:44 +0000
49
@@ -8,7 +8,10 @@
50
8
  check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
8
  check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
51
9
}
9
}
52
10
check.commands += cd ../../..;
10
check.commands += cd ../../..;
54
11
check.commands += qmlplugindump Ubuntu.Components 0.1 modules > plugins.qmltypes;
11
# Silence spam on stderr due to fonts
55
12
# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
56
13
# https://bugreports.qt-project.org/browse/QTBUG-36243
57
14
check.commands += qmlplugindump Ubuntu.Components 0.1 modules 2>/dev/null > plugins.qmltypes;
58
12
# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
15
# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
59
13
check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir plugins.qmltypes > components.api.new;
16
check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir plugins.qmltypes > components.api.new;
60
14
check.commands += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit
17
check.commands += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit
61
15
18
62
=== modified file 'tests/unit/runtest.sh'
63
--- tests/unit/runtest.sh	2013-12-09 14:02:08 +0000
64
+++ tests/unit/runtest.sh	2014-01-20 16:27:44 +0000
65
@@ -38,7 +38,10 @@
66
38
function execute_test_cmd {
38
function execute_test_cmd {
67
39
  echo "Executing $_CMD $_ARGS"
39
  echo "Executing $_CMD $_ARGS"
68
40
  if [ $DISPLAY ]; then
40
  if [ $DISPLAY ]; then
70
41
      QML2_IMPORT_PATH=../../../modules:$QML2_IMPORT_PATH UBUNTU_UI_TOOLKIT_THEMES_PATH=../../../modules $_CMD $_ARGS
41
      # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
71
42
      # https://bugreports.qt-project.org/browse/QTBUG-36243
72
43
      QML2_IMPORT_PATH=../../../modules:$QML2_IMPORT_PATH UBUNTU_UI_TOOLKIT_THEMES_PATH=../../../modules \
73
44
          $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
74
42
  else
45
  else
75
43
      echo "Skipped because no DISPLAY available"
46
      echo "Skipped because no DISPLAY available"
76
44
  fi
47
  fi
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-01-31
Tim Peeters		2013-12-18	Approve on 2014-01-17
Review via email: mp+199439@code.launchpad.net