Ubuntu Settings Components

Merge lp:~nick-dedekind/ubuntu-settings-components/menu.plugin into lp:~registry/ubuntu-settings-components/trunk

  1. menu.plugin
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Michał Sawicz
Approved revision: 70
Merged at revision: 73
Proposed branch: lp:~nick-dedekind/ubuntu-settings-components/menu.plugin
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 470 lines (+284/-36)
18 files modified
CMakeLists.txt (+2/-20)
Ubuntu/CMakeLists.txt (+1/-0)
Ubuntu/Settings/CMakeLists.txt (+9/-0)
Ubuntu/Settings/Components/CMakeLists.txt (+3/-0)
Ubuntu/Settings/Components/artwork/CMakeLists.txt (+2/-0)
Ubuntu/Settings/Menus/CMakeLists.txt (+30/-0)
Ubuntu/Settings/Menus/artwork/CMakeLists.txt (+2/-0)
Ubuntu/Settings/Menus/plugin.cpp (+21/-0)
Ubuntu/Settings/Menus/plugin.h (+30/-0)
Ubuntu/Settings/Menus/pluginglobal.h (+23/-0)
Ubuntu/Settings/Menus/qmldir (+3/-0)
cmake/modules/QmlPlugins.cmake (+143/-0)
debian/changelog (+7/-0)
debian/control (+5/-13)
debian/qtdeclarative5-ubuntu-settings-components-assets.install (+0/-1)
debian/qtdeclarative5-ubuntu-settings-components.install (+0/-1)
debian/rules (+2/-0)
tests/qmltests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~nick-dedekind/ubuntu-settings-components/menu.plugin
Reviewer Review Type Date Requested Status
Michał Sawicz (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Ubuntu Unity PS integration team packaging Pending
Registry Administrators Pending
Review via email: mp+224616@code.launchpad.net

Commit message

Added plugin module for Ubuntu.Settings.Menus

Description of the change

Added plugin module for Ubuntu.Settings.Menus.
Removed Architecture independent package.

The C++ plugin is empty now, but will be used by a branch with a prerequisite.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/45/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/45/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/46/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/47/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/48/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/49/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

See inline

review: Needs Fixing
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> See inline

Done.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/50/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

ACK.

review: Approve
lp:~nick-dedekind/ubuntu-settings-components/menu.plugin updated
71. By Nick Dedekind

updated packaging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-10-04 10:52:27 +0000
+++ CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -14,15 +14,12 @@
14set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})14set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
1515
16get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)16get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
17exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)17exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
18file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)18file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
1919
20set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})20set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
21LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "Qt5Quick")21LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "Qt5Quick")
2222
23set(UBUNTU_QML_DIR ${QT_IMPORTS_DIR}/Ubuntu)
24set(SETTINGS_COMPONENTS_DIR ${CMAKE_INSTALL_DATADIR}/ubuntu-settings-components)
25
26find_package(Qt5Core REQUIRED)23find_package(Qt5Core REQUIRED)
27find_package(Qt5Quick REQUIRED)24find_package(Qt5Quick REQUIRED)
28find_package(Qt5Widgets REQUIRED)25find_package(Qt5Widgets REQUIRED)
@@ -72,23 +69,8 @@
72 endif()69 endif()
73endif()70endif()
7471
75# Install subdirectories
76set(QML_DIRS
77 Ubuntu/Settings
78 )
79
80# Install arch-independent assets under /usr/share
81install(DIRECTORY ${QML_DIRS}
82 DESTINATION ${SETTINGS_COMPONENTS_DIR}
83 )
84
85install(CODE "EXECUTE_PROCESS(COMMAND
86 mkdir -p \$ENV{DESTDIR}${UBUNTU_QML_DIR})")
87install(CODE "EXECUTE_PROCESS(COMMAND
88 ln -sf ${CMAKE_INSTALL_PREFIX}/${SETTINGS_COMPONENTS_DIR}/Settings
89 \$ENV{DESTDIR}${UBUNTU_QML_DIR}/Settings)")
90
91# Tests72# Tests
92enable_testing()73enable_testing()
9374
75add_subdirectory(Ubuntu)
94add_subdirectory(tests)76add_subdirectory(tests)
9577
=== added file 'Ubuntu/CMakeLists.txt'
--- Ubuntu/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,1 @@
1add_subdirectory(Settings)
02
=== added file 'Ubuntu/Settings/CMakeLists.txt'
--- Ubuntu/Settings/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,9 @@
1include(QmlPlugins)
2
3macro(add_usc_plugin PLUGIN VERSION PATH)
4 export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
5 export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
6endmacro()
7
8add_subdirectory(Components)
9add_subdirectory(Menus)
010
=== added file 'Ubuntu/Settings/Components/CMakeLists.txt'
--- Ubuntu/Settings/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Components/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,3 @@
1add_subdirectory(artwork)
2
3add_usc_plugin(Ubuntu.Settings.Components 0.1 Ubuntu/Settings/Components)
04
=== added file 'Ubuntu/Settings/Components/artwork/CMakeLists.txt'
--- Ubuntu/Settings/Components/artwork/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Components/artwork/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,2 @@
1# export the artwork files.
2export_qmlfiles(Ubuntu.Settings.Components.Art Ubuntu/Settings/Components/artwork DESTINATION ${QT_IMPORTS_DIR})
03
=== added file 'Ubuntu/Settings/Menus/CMakeLists.txt'
--- Ubuntu/Settings/Menus/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,30 @@
1project(UbuntuSettingsMenusQml)
2
3add_subdirectory(artwork)
4
5find_package(Qt5Core REQUIRED)
6
7include_directories(
8 ${CMAKE_CURRENT_SOURCE_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
10)
11
12set(UbuntuSettingsMenusQml_SOURCES
13 plugin.cpp
14)
15add_definitions(-DUBUNTUSETTINGSCOMPONENTS_LIBRARY)
16
17add_library(UbuntuSettingsMenusQml MODULE
18 ${UbuntuSettingsMenusQml_SOURCES}
19)
20
21target_link_libraries(UbuntuSettingsMenusQml
22 ${GLIB_LIBRARIES}
23 ${GIO_LIBRARIES}
24 ${QMENUMODEL_LDFLAGS}
25 ${LIBUPSTART_LIBRARIES}
26)
27
28qt5_use_modules(UbuntuSettingsMenusQml Core Qml Quick)
29
30add_usc_plugin(Ubuntu.Settings.Menus 0.1 Ubuntu/Settings/Menus TARGETS UbuntuSettingsMenusQml)
031
=== added file 'Ubuntu/Settings/Menus/artwork/CMakeLists.txt'
--- Ubuntu/Settings/Menus/artwork/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/artwork/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -0,0 +1,2 @@
1# export the artwork files.
2export_qmlfiles(Ubuntu.Settings.Menus.Art Ubuntu/Settings/Menus/artwork DESTINATION ${QT_IMPORTS_DIR})
03
=== added file 'Ubuntu/Settings/Menus/plugin.cpp'
--- Ubuntu/Settings/Menus/plugin.cpp 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/plugin.cpp 2014-07-07 15:47:31 +0000
@@ -0,0 +1,21 @@
1/*
2 * Copyright (C) 2014 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "plugin.h"
18
19void UbuntuSettingsComponentsPlugin::registerTypes(const char *uri)
20{
21}
022
=== added file 'Ubuntu/Settings/Menus/plugin.h'
--- Ubuntu/Settings/Menus/plugin.h 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/plugin.h 2014-07-07 15:47:31 +0000
@@ -0,0 +1,30 @@
1/*
2 * Copyright (C) 2014 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#ifndef UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
18#define UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
19
20#include <QtQml/QQmlExtensionPlugin>
21
22class UbuntuSettingsComponentsPlugin : public QQmlExtensionPlugin
23{
24 Q_OBJECT
25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26public:
27 void registerTypes(const char *uri);
28};
29
30#endif // UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
031
=== added file 'Ubuntu/Settings/Menus/pluginglobal.h'
--- Ubuntu/Settings/Menus/pluginglobal.h 1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/pluginglobal.h 2014-07-07 15:47:31 +0000
@@ -0,0 +1,23 @@
1/*
2 * Copyright (C) 2014 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include <QtCore/QtGlobal>
18
19#if defined(UBUNTUSETTINGSCOMPONENTS_LIBRARY)
20# define UBUNTUSETTINGSCOMPONENTS_EXPORT Q_DECL_EXPORT
21#else
22# define UBUNTUSETTINGSCOMPONENTS_EXPORT Q_DECL_IMPORT
23#endif
024
=== modified file 'Ubuntu/Settings/Menus/qmldir'
--- Ubuntu/Settings/Menus/qmldir 2014-05-27 14:43:07 +0000
+++ Ubuntu/Settings/Menus/qmldir 2014-07-07 15:47:31 +0000
@@ -1,4 +1,6 @@
1module Ubuntu.Settings.Menus1module Ubuntu.Settings.Menus
2plugin UbuntuSettingsMenusQml
3typeinfo plugin.qmltypes
24
3AccessPointMenu 0.1 AccessPointMenu.qml5AccessPointMenu 0.1 AccessPointMenu.qml
4ButtonMenu 0.1 ButtonMenu.qml6ButtonMenu 0.1 ButtonMenu.qml
@@ -19,6 +21,7 @@
19SwitchMenu 0.1 SwitchMenu.qml21SwitchMenu 0.1 SwitchMenu.qml
20TextMessageMenu 0.1 TextMessageMenu.qml22TextMessageMenu 0.1 TextMessageMenu.qml
21TimeZoneMenu 0.1 TimeZoneMenu.qml23TimeZoneMenu 0.1 TimeZoneMenu.qml
24TransferMenu 0.1 TransferMenu.qml
22UserSessionMenu 0.1 UserSessionMenu.qml25UserSessionMenu 0.1 UserSessionMenu.qml
2326
24internal HeroMessageMenu HeroMessageMenu.qml27internal HeroMessageMenu HeroMessageMenu.qml
2528
=== added file 'cmake/modules/QmlPlugins.cmake'
--- cmake/modules/QmlPlugins.cmake 1970-01-01 00:00:00 +0000
+++ cmake/modules/QmlPlugins.cmake 2014-07-07 15:47:31 +0000
@@ -0,0 +1,143 @@
1# If you need to override the qmlplugindump binary, create the qmlplugin executable
2# target before loading this plugin.
3
4if(NOT TARGET qmlplugindump)
5 find_program(qmlplugindump_exe qmlplugindump)
6
7 if(NOT qmlplugindump_exe)
8 msg(FATAL_ERROR "Could not locate qmlplugindump.")
9 endif()
10
11 add_executable(qmlplugindump IMPORTED)
12 set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
13endif()
14
15
16# Creates a target for copying resource files into build dir and optionally installing them.
17#
18# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
19# into ${DESTINATION}/${path}.
20#
21# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
22#
23# export_qmlfiles(plugin path
24# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
25# [BINARY_DIR path]
26# [DESTINATION path]
27# [TARGET_PREFIX string] # Will be prefixed to the target name
28# )
29#
30# Created target:
31# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
32
33macro(export_qmlfiles PLUGIN PATH)
34 set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
35 cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
36
37 if(NOT QMLFILES_SEARCH_PATH)
38 set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
39 endif()
40
41 if(QMLFILES_BINARY_DIR)
42 set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
43 else()
44 set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
45 endif()
46
47 file(GLOB QMLFILES
48 ${QMLFILES_SEARCH_PATH}/*.qml
49 ${QMLFILES_SEARCH_PATH}/*.js
50 ${QMLFILES_SEARCH_PATH}/*.jpg
51 ${QMLFILES_SEARCH_PATH}/*.png
52 ${QMLFILES_SEARCH_PATH}/*.sci
53 ${QMLFILES_SEARCH_PATH}/*.svg
54 ${QMLFILES_SEARCH_PATH}/qmldir
55 )
56
57 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
58
59 # copy the files
60 add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
61 COMMAND cp ${QMLFILES} ${qmlfiles_dir}
62 DEPENDS ${QMLFILES}
63 SOURCES ${QMLFILES}
64 )
65
66 if(QMLFILES_DESTINATION)
67 # install the qmlfiles file.
68 install(FILES ${QMLFILES}
69 DESTINATION ${QMLFILES_DESTINATION}/${PATH}
70 )
71 endif()
72endmacro(export_qmlfiles)
73
74
75# Creates a target for generating the typeinfo file for a QML plugin and optionally installs it
76# and additional targets.
77#
78# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
79# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
80# path ends with ${path}.
81#
82# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
83#
84# export_qmlplugin(plugin version path
85# [BINARY_DIR path]
86# [DESTINATION path]
87# [TARGET_PREFIX string] # Will be prefixed to the target name
88# [ENVIRONMENT string] # Will be added to qmlplugindump's env
89# [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
90# )
91#
92# Created target:
93# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the binary dir.
94
95macro(export_qmlplugin PLUGIN VERSION PATH)
96 set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
97 set(multi TARGETS)
98 cmake_parse_arguments(QMLPLUGIN "" "${single}" "${multi}" ${ARGN})
99
100 get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
101
102 if(QMLPLUGIN_BINARY_DIR)
103 set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
104 else()
105 # Find import path to point qmlplugindump at
106 string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
107 set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
108 endif()
109
110 # Find the last segment of the plugin name to use as qmltypes basename
111 string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
112 set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
113 set(qmltypes_path ${qmlplugin_dir}/${plugin_suffix}.qmltypes)
114
115 # Only generate typeinfo if not cross compiling
116 if(NOT CMAKE_CROSSCOMPILING)
117 add_custom_target(${target_prefix}-qmltypes ALL
118 COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
119 ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
120 )
121 add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
122
123 if (QMLPLUGIN_DESTINATION)
124 # Install the typeinfo file
125 install(FILES ${qmltypes_path}
126 DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
127 )
128 endif()
129 endif()
130
131 set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
132 ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
133 LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
134 RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
135 )
136
137 if (QMLPLUGIN_DESTINATION)
138 # Install additional targets
139 install(TARGETS ${QMLPLUGIN_TARGETS}
140 DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
141 )
142 endif()
143endmacro()
0144
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-03 14:00:55 +0000
+++ debian/changelog 2014-07-07 15:47:31 +0000
@@ -1,3 +1,10 @@
1ubuntu-settings-components (0.3-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Nick Dedekind ]
4 * Added plugin module for Ubuntu.Settings.Menus
5
6 -- Nicholas Dedekind <nicholas.dedekind@gmail.com> Mon, 07 Jul 2014 16:43:16 +0100
7
1ubuntu-settings-components (0.2+14.10.20140701.2-0ubuntu2) utopic; urgency=medium8ubuntu-settings-components (0.2+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
29
3 * debian/control: 10 * debian/control:
411
=== modified file 'debian/control'
--- debian/control 2014-07-03 14:00:55 +0000
+++ debian/control 2014-07-07 15:47:31 +0000
@@ -5,9 +5,9 @@
5Build-Depends: cmake,5Build-Depends: cmake,
6 debhelper (>= 9),6 debhelper (>= 9),
7 pkg-config,7 pkg-config,
8 qml-module-qtquick-layouts,
8 qt5-default,9 qt5-default,
9 qtbase5-private-dev,10 qtbase5-private-dev,
10 qml-module-qtquick-layouts,
11 qtdeclarative5-dev,11 qtdeclarative5-dev,
12 qtdeclarative5-dev-tools,12 qtdeclarative5-dev-tools,
13 qtdeclarative5-qtquick2-plugin,13 qtdeclarative5-qtquick2-plugin,
@@ -26,19 +26,11 @@
26Multi-Arch: same26Multi-Arch: same
27Pre-Depends: dpkg (>= 1.15.6~)27Pre-Depends: dpkg (>= 1.15.6~)
28Depends: qml-module-qtquick-layouts,28Depends: qml-module-qtquick-layouts,
29 qtdeclarative5-ubuntu-settings-components-assets (= ${source:Version}),
30 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.48),29 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.48),
31 suru-icon-theme,30 suru-icon-theme,
32 ${misc:Depends},31 ${misc:Depends},
33 ${shlibs:Depends},32 ${shlibs:Depends},
34Description: Ubuntu Settings Components33Breaks: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
35 This package provides a link from /usr/lib to /usr/share, so QML can34Replaces: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
36 find its assets.35Description: Ubuntu Settings Components
3736 Ubuntu settings components for Unity
38Package: qtdeclarative5-ubuntu-settings-components-assets
39Architecture: all
40Multi-Arch: foreign
41Depends: ${misc:Depends},
42 ${shlibs:Depends},
43Description: Ubuntu Settings Components
44 Architecture-independent QML and images files for Ubuntu Settings.
45\ No newline at end of file37\ No newline at end of file
4638
=== removed file 'debian/qtdeclarative5-ubuntu-settings-components-assets.install'
--- debian/qtdeclarative5-ubuntu-settings-components-assets.install 2013-08-09 16:15:15 +0000
+++ debian/qtdeclarative5-ubuntu-settings-components-assets.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/share/
20
=== removed file 'debian/qtdeclarative5-ubuntu-settings-components.install'
--- debian/qtdeclarative5-ubuntu-settings-components.install 2013-08-09 16:15:15 +0000
+++ debian/qtdeclarative5-ubuntu-settings-components.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/
20
=== modified file 'debian/rules'
--- debian/rules 2013-10-04 16:26:57 +0000
+++ debian/rules 2014-07-07 15:47:31 +0000
@@ -1,6 +1,8 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
33
4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
4export DPKG_GENSYMBOLS_CHECK_LEVEL=46export DPKG_GENSYMBOLS_CHECK_LEVEL=4
57
6%:8%:
79
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt 2014-06-30 15:36:05 +0000
+++ tests/qmltests/CMakeLists.txt 2014-07-07 15:47:31 +0000
@@ -6,7 +6,7 @@
6set(qmltest_DEFAULT_PROPERTIES "")6set(qmltest_DEFAULT_PROPERTIES "")
77
8set(qmltest_DEFAULT_IMPORT_PATHS8set(qmltest_DEFAULT_IMPORT_PATHS
9 ${CMAKE_SOURCE_DIR}9 ${CMAKE_BINARY_DIR}
10 ${CMAKE_BINARY_DIR}/tests/utils/modules10 ${CMAKE_BINARY_DIR}/tests/utils/modules
11)11)
1212

Subscribers

People subscribed via source and target branches

to all changes: