1a42863 · unity8 · git.iko.soy

CMakeLists.txt+1−2

compare with xenial

unifiedsplit

@@ -53,7 +53,6 @@ find_package(Qt5Qml)

53find_package(Qt5Quick)

54find_package(Qt5Gui)

55find_package(Qt5DBus)

56−find_package(Qt5Multimedia)

57

56

58# Standard install paths

57# Standard install paths

59include(GNUInstallDirs)

58include(GNUInstallDirs)

@@ -111,7 +110,7 @@ add_executable(${SHELL_APP}

111 MouseTouchAdaptor.cpp

110 MouseTouchAdaptor.cpp

112 )

111 )

113

112

114−qt5_use_modules(${SHELL_APP} Qml Quick Test Multimedia)

113+qt5_use_modules(${SHELL_APP} Qml Quick Test)

115pkg_check_modules(XCB REQUIRED xcb)

114pkg_check_modules(XCB REQUIRED xcb)

116

115

117if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")

116if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")

debian/control−1

@@ -43,7 +43,6 @@ Build-Depends: cmake,

43 qtdeclarative5-test-plugin,

44 qtdeclarative5-ubuntu-ui-toolkit-plugin,

45 qtdeclarative5-xmllistmodel-plugin,

46− qtmultimedia5-dev,

47 ttf-ubuntu-font-family,

46 ttf-ubuntu-font-family,

48Standards-Version: 3.9.4

47Standards-Version: 3.9.4

49Homepage: http://launchpad.net/unity

48Homepage: http://launchpad.net/unity

tests/qmltests/Dash/Movie/tst_MoviePreview.qml+1−1

@@ -52,7 +52,7 @@ Item {

52 property string image: "image://theme/syncing"

53 property var actions: get_actions_data()

54 property string year: "2013"

55− property int rating: 3

55+ property real rating: 0.3

56 property int numRatings: 1

57 property var execute: fake_callback

58 }