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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-04 10:52:27 +0000
3+++ CMakeLists.txt 2014-07-07 15:47:31 +0000
4@@ -14,15 +14,12 @@
5 set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
6
7 get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
8-exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)
9+exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
10 file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
11
12 set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
13 LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "Qt5Quick")
14
15-set(UBUNTU_QML_DIR ${QT_IMPORTS_DIR}/Ubuntu)
16-set(SETTINGS_COMPONENTS_DIR ${CMAKE_INSTALL_DATADIR}/ubuntu-settings-components)
17-
18 find_package(Qt5Core REQUIRED)
19 find_package(Qt5Quick REQUIRED)
20 find_package(Qt5Widgets REQUIRED)
21@@ -72,23 +69,8 @@
22 endif()
23 endif()
24
25-# Install subdirectories
26-set(QML_DIRS
27- Ubuntu/Settings
28- )
29-
30-# Install arch-independent assets under /usr/share
31-install(DIRECTORY ${QML_DIRS}
32- DESTINATION ${SETTINGS_COMPONENTS_DIR}
33- )
34-
35-install(CODE "EXECUTE_PROCESS(COMMAND
36- mkdir -p \$ENV{DESTDIR}${UBUNTU_QML_DIR})")
37-install(CODE "EXECUTE_PROCESS(COMMAND
38- ln -sf ${CMAKE_INSTALL_PREFIX}/${SETTINGS_COMPONENTS_DIR}/Settings
39- \$ENV{DESTDIR}${UBUNTU_QML_DIR}/Settings)")
40-
41 # Tests
42 enable_testing()
43
44+add_subdirectory(Ubuntu)
45 add_subdirectory(tests)
46
47=== added file 'Ubuntu/CMakeLists.txt'
48--- Ubuntu/CMakeLists.txt 1970-01-01 00:00:00 +0000
49+++ Ubuntu/CMakeLists.txt 2014-07-07 15:47:31 +0000
50@@ -0,0 +1,1 @@
51+add_subdirectory(Settings)
52
53=== added file 'Ubuntu/Settings/CMakeLists.txt'
54--- Ubuntu/Settings/CMakeLists.txt 1970-01-01 00:00:00 +0000
55+++ Ubuntu/Settings/CMakeLists.txt 2014-07-07 15:47:31 +0000
56@@ -0,0 +1,9 @@
57+include(QmlPlugins)
58+
59+macro(add_usc_plugin PLUGIN VERSION PATH)
60+ export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
61+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
62+endmacro()
63+
64+add_subdirectory(Components)
65+add_subdirectory(Menus)
66
67=== added file 'Ubuntu/Settings/Components/CMakeLists.txt'
68--- Ubuntu/Settings/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
69+++ Ubuntu/Settings/Components/CMakeLists.txt 2014-07-07 15:47:31 +0000
70@@ -0,0 +1,3 @@
71+add_subdirectory(artwork)
72+
73+add_usc_plugin(Ubuntu.Settings.Components 0.1 Ubuntu/Settings/Components)
74
75=== added file 'Ubuntu/Settings/Components/artwork/CMakeLists.txt'
76--- Ubuntu/Settings/Components/artwork/CMakeLists.txt 1970-01-01 00:00:00 +0000
77+++ Ubuntu/Settings/Components/artwork/CMakeLists.txt 2014-07-07 15:47:31 +0000
78@@ -0,0 +1,2 @@
79+# export the artwork files.
80+export_qmlfiles(Ubuntu.Settings.Components.Art Ubuntu/Settings/Components/artwork DESTINATION ${QT_IMPORTS_DIR})
81
82=== added file 'Ubuntu/Settings/Menus/CMakeLists.txt'
83--- Ubuntu/Settings/Menus/CMakeLists.txt 1970-01-01 00:00:00 +0000
84+++ Ubuntu/Settings/Menus/CMakeLists.txt 2014-07-07 15:47:31 +0000
85@@ -0,0 +1,30 @@
86+project(UbuntuSettingsMenusQml)
87+
88+add_subdirectory(artwork)
89+
90+find_package(Qt5Core REQUIRED)
91+
92+include_directories(
93+ ${CMAKE_CURRENT_SOURCE_DIR}
94+ ${CMAKE_CURRENT_BINARY_DIR}
95+)
96+
97+set(UbuntuSettingsMenusQml_SOURCES
98+ plugin.cpp
99+)
100+add_definitions(-DUBUNTUSETTINGSCOMPONENTS_LIBRARY)
101+
102+add_library(UbuntuSettingsMenusQml MODULE
103+ ${UbuntuSettingsMenusQml_SOURCES}
104+)
105+
106+target_link_libraries(UbuntuSettingsMenusQml
107+ ${GLIB_LIBRARIES}
108+ ${GIO_LIBRARIES}
109+ ${QMENUMODEL_LDFLAGS}
110+ ${LIBUPSTART_LIBRARIES}
111+)
112+
113+qt5_use_modules(UbuntuSettingsMenusQml Core Qml Quick)
114+
115+add_usc_plugin(Ubuntu.Settings.Menus 0.1 Ubuntu/Settings/Menus TARGETS UbuntuSettingsMenusQml)
116
117=== added file 'Ubuntu/Settings/Menus/artwork/CMakeLists.txt'
118--- Ubuntu/Settings/Menus/artwork/CMakeLists.txt 1970-01-01 00:00:00 +0000
119+++ Ubuntu/Settings/Menus/artwork/CMakeLists.txt 2014-07-07 15:47:31 +0000
120@@ -0,0 +1,2 @@
121+# export the artwork files.
122+export_qmlfiles(Ubuntu.Settings.Menus.Art Ubuntu/Settings/Menus/artwork DESTINATION ${QT_IMPORTS_DIR})
123
124=== added file 'Ubuntu/Settings/Menus/plugin.cpp'
125--- Ubuntu/Settings/Menus/plugin.cpp 1970-01-01 00:00:00 +0000
126+++ Ubuntu/Settings/Menus/plugin.cpp 2014-07-07 15:47:31 +0000
127@@ -0,0 +1,21 @@
128+/*
129+ * Copyright (C) 2014 Canonical, Ltd.
130+ *
131+ * This program is free software; you can redistribute it and/or modify
132+ * it under the terms of the GNU Lesser General Public License as published by
133+ * the Free Software Foundation; version 3.
134+ *
135+ * This program is distributed in the hope that it will be useful,
136+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
137+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
138+ * GNU Lesser General Public License for more details.
139+ *
140+ * You should have received a copy of the GNU Lesser General Public License
141+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
142+ */
143+
144+#include "plugin.h"
145+
146+void UbuntuSettingsComponentsPlugin::registerTypes(const char *uri)
147+{
148+}
149
150=== added file 'Ubuntu/Settings/Menus/plugin.h'
151--- Ubuntu/Settings/Menus/plugin.h 1970-01-01 00:00:00 +0000
152+++ Ubuntu/Settings/Menus/plugin.h 2014-07-07 15:47:31 +0000
153@@ -0,0 +1,30 @@
154+/*
155+ * Copyright (C) 2014 Canonical, Ltd.
156+ *
157+ * This program is free software; you can redistribute it and/or modify
158+ * it under the terms of the GNU Lesser General Public License as published by
159+ * the Free Software Foundation; version 3.
160+ *
161+ * This program is distributed in the hope that it will be useful,
162+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
163+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
164+ * GNU Lesser General Public License for more details.
165+ *
166+ * You should have received a copy of the GNU Lesser General Public License
167+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
168+ */
169+
170+#ifndef UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
171+#define UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
172+
173+#include <QtQml/QQmlExtensionPlugin>
174+
175+class UbuntuSettingsComponentsPlugin : public QQmlExtensionPlugin
176+{
177+ Q_OBJECT
178+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
179+public:
180+ void registerTypes(const char *uri);
181+};
182+
183+#endif // UBUNTUSETTINGSCOMPOENNTS_PLUGIN_H
184
185=== added file 'Ubuntu/Settings/Menus/pluginglobal.h'
186--- Ubuntu/Settings/Menus/pluginglobal.h 1970-01-01 00:00:00 +0000
187+++ Ubuntu/Settings/Menus/pluginglobal.h 2014-07-07 15:47:31 +0000
188@@ -0,0 +1,23 @@
189+/*
190+ * Copyright (C) 2014 Canonical, Ltd.
191+ *
192+ * This program is free software; you can redistribute it and/or modify
193+ * it under the terms of the GNU Lesser General Public License as published by
194+ * the Free Software Foundation; version 3.
195+ *
196+ * This program is distributed in the hope that it will be useful,
197+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
198+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
199+ * GNU Lesser General Public License for more details.
200+ *
201+ * You should have received a copy of the GNU Lesser General Public License
202+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
203+ */
204+
205+#include <QtCore/QtGlobal>
206+
207+#if defined(UBUNTUSETTINGSCOMPONENTS_LIBRARY)
208+# define UBUNTUSETTINGSCOMPONENTS_EXPORT Q_DECL_EXPORT
209+#else
210+# define UBUNTUSETTINGSCOMPONENTS_EXPORT Q_DECL_IMPORT
211+#endif
212
213=== modified file 'Ubuntu/Settings/Menus/qmldir'
214--- Ubuntu/Settings/Menus/qmldir 2014-05-27 14:43:07 +0000
215+++ Ubuntu/Settings/Menus/qmldir 2014-07-07 15:47:31 +0000
216@@ -1,4 +1,6 @@
217 module Ubuntu.Settings.Menus
218+plugin UbuntuSettingsMenusQml
219+typeinfo plugin.qmltypes
220
221 AccessPointMenu 0.1 AccessPointMenu.qml
222 ButtonMenu 0.1 ButtonMenu.qml
223@@ -19,6 +21,7 @@
224 SwitchMenu 0.1 SwitchMenu.qml
225 TextMessageMenu 0.1 TextMessageMenu.qml
226 TimeZoneMenu 0.1 TimeZoneMenu.qml
227+TransferMenu 0.1 TransferMenu.qml
228 UserSessionMenu 0.1 UserSessionMenu.qml
229
230 internal HeroMessageMenu HeroMessageMenu.qml
231
232=== added file 'cmake/modules/QmlPlugins.cmake'
233--- cmake/modules/QmlPlugins.cmake 1970-01-01 00:00:00 +0000
234+++ cmake/modules/QmlPlugins.cmake 2014-07-07 15:47:31 +0000
235@@ -0,0 +1,143 @@
236+# If you need to override the qmlplugindump binary, create the qmlplugin executable
237+# target before loading this plugin.
238+
239+if(NOT TARGET qmlplugindump)
240+ find_program(qmlplugindump_exe qmlplugindump)
241+
242+ if(NOT qmlplugindump_exe)
243+ msg(FATAL_ERROR "Could not locate qmlplugindump.")
244+ endif()
245+
246+ add_executable(qmlplugindump IMPORTED)
247+ set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
248+endif()
249+
250+
251+# Creates a target for copying resource files into build dir and optionally installing them.
252+#
253+# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
254+# into ${DESTINATION}/${path}.
255+#
256+# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
257+#
258+# export_qmlfiles(plugin path
259+# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
260+# [BINARY_DIR path]
261+# [DESTINATION path]
262+# [TARGET_PREFIX string] # Will be prefixed to the target name
263+# )
264+#
265+# Created target:
266+# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
267+
268+macro(export_qmlfiles PLUGIN PATH)
269+ set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
270+ cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
271+
272+ if(NOT QMLFILES_SEARCH_PATH)
273+ set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
274+ endif()
275+
276+ if(QMLFILES_BINARY_DIR)
277+ set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
278+ else()
279+ set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
280+ endif()
281+
282+ file(GLOB QMLFILES
283+ ${QMLFILES_SEARCH_PATH}/*.qml
284+ ${QMLFILES_SEARCH_PATH}/*.js
285+ ${QMLFILES_SEARCH_PATH}/*.jpg
286+ ${QMLFILES_SEARCH_PATH}/*.png
287+ ${QMLFILES_SEARCH_PATH}/*.sci
288+ ${QMLFILES_SEARCH_PATH}/*.svg
289+ ${QMLFILES_SEARCH_PATH}/qmldir
290+ )
291+
292+ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
293+
294+ # copy the files
295+ add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
296+ COMMAND cp ${QMLFILES} ${qmlfiles_dir}
297+ DEPENDS ${QMLFILES}
298+ SOURCES ${QMLFILES}
299+ )
300+
301+ if(QMLFILES_DESTINATION)
302+ # install the qmlfiles file.
303+ install(FILES ${QMLFILES}
304+ DESTINATION ${QMLFILES_DESTINATION}/${PATH}
305+ )
306+ endif()
307+endmacro(export_qmlfiles)
308+
309+
310+# Creates a target for generating the typeinfo file for a QML plugin and optionally installs it
311+# and additional targets.
312+#
313+# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
314+# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
315+# path ends with ${path}.
316+#
317+# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
318+#
319+# export_qmlplugin(plugin version path
320+# [BINARY_DIR path]
321+# [DESTINATION path]
322+# [TARGET_PREFIX string] # Will be prefixed to the target name
323+# [ENVIRONMENT string] # Will be added to qmlplugindump's env
324+# [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
325+# )
326+#
327+# Created target:
328+# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the binary dir.
329+
330+macro(export_qmlplugin PLUGIN VERSION PATH)
331+ set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
332+ set(multi TARGETS)
333+ cmake_parse_arguments(QMLPLUGIN "" "${single}" "${multi}" ${ARGN})
334+
335+ get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
336+
337+ if(QMLPLUGIN_BINARY_DIR)
338+ set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
339+ else()
340+ # Find import path to point qmlplugindump at
341+ string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
342+ set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
343+ endif()
344+
345+ # Find the last segment of the plugin name to use as qmltypes basename
346+ string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
347+ set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
348+ set(qmltypes_path ${qmlplugin_dir}/${plugin_suffix}.qmltypes)
349+
350+ # Only generate typeinfo if not cross compiling
351+ if(NOT CMAKE_CROSSCOMPILING)
352+ add_custom_target(${target_prefix}-qmltypes ALL
353+ COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
354+ ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
355+ )
356+ add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
357+
358+ if (QMLPLUGIN_DESTINATION)
359+ # Install the typeinfo file
360+ install(FILES ${qmltypes_path}
361+ DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
362+ )
363+ endif()
364+ endif()
365+
366+ set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
367+ ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
368+ LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
369+ RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
370+ )
371+
372+ if (QMLPLUGIN_DESTINATION)
373+ # Install additional targets
374+ install(TARGETS ${QMLPLUGIN_TARGETS}
375+ DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
376+ )
377+ endif()
378+endmacro()
379
380=== modified file 'debian/changelog'
381--- debian/changelog 2014-07-03 14:00:55 +0000
382+++ debian/changelog 2014-07-07 15:47:31 +0000
383@@ -1,3 +1,10 @@
384+ubuntu-settings-components (0.3-0ubuntu1) UNRELEASED; urgency=medium
385+
386+ [ Nick Dedekind ]
387+ * Added plugin module for Ubuntu.Settings.Menus
388+
389+ -- Nicholas Dedekind <nicholas.dedekind@gmail.com> Mon, 07 Jul 2014 16:43:16 +0100
390+
391 ubuntu-settings-components (0.2+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
392
393 * debian/control:
394
395=== modified file 'debian/control'
396--- debian/control 2014-07-03 14:00:55 +0000
397+++ debian/control 2014-07-07 15:47:31 +0000
398@@ -5,9 +5,9 @@
399 Build-Depends: cmake,
400 debhelper (>= 9),
401 pkg-config,
402+ qml-module-qtquick-layouts,
403 qt5-default,
404 qtbase5-private-dev,
405- qml-module-qtquick-layouts,
406 qtdeclarative5-dev,
407 qtdeclarative5-dev-tools,
408 qtdeclarative5-qtquick2-plugin,
409@@ -26,19 +26,11 @@
410 Multi-Arch: same
411 Pre-Depends: dpkg (>= 1.15.6~)
412 Depends: qml-module-qtquick-layouts,
413- qtdeclarative5-ubuntu-settings-components-assets (= ${source:Version}),
414 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.48),
415 suru-icon-theme,
416 ${misc:Depends},
417 ${shlibs:Depends},
418-Description: Ubuntu Settings Components
419- This package provides a link from /usr/lib to /usr/share, so QML can
420- find its assets.
421-
422-Package: qtdeclarative5-ubuntu-settings-components-assets
423-Architecture: all
424-Multi-Arch: foreign
425-Depends: ${misc:Depends},
426- ${shlibs:Depends},
427-Description: Ubuntu Settings Components
428- Architecture-independent QML and images files for Ubuntu Settings.
429+Breaks: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
430+Replaces: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
431+Description: Ubuntu Settings Components
432+ Ubuntu settings components for Unity
433\ No newline at end of file
434
435=== removed file 'debian/qtdeclarative5-ubuntu-settings-components-assets.install'
436--- debian/qtdeclarative5-ubuntu-settings-components-assets.install 2013-08-09 16:15:15 +0000
437+++ debian/qtdeclarative5-ubuntu-settings-components-assets.install 1970-01-01 00:00:00 +0000
438@@ -1,1 +0,0 @@
439-usr/share/
440
441=== removed file 'debian/qtdeclarative5-ubuntu-settings-components.install'
442--- debian/qtdeclarative5-ubuntu-settings-components.install 2013-08-09 16:15:15 +0000
443+++ debian/qtdeclarative5-ubuntu-settings-components.install 1970-01-01 00:00:00 +0000
444@@ -1,1 +0,0 @@
445-usr/lib/
446
447=== modified file 'debian/rules'
448--- debian/rules 2013-10-04 16:26:57 +0000
449+++ debian/rules 2014-07-07 15:47:31 +0000
450@@ -1,6 +1,8 @@
451 #!/usr/bin/make -f
452 # -*- makefile -*-
453
454+# Uncomment this to turn on verbose mode.
455+#export DH_VERBOSE=1
456 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
457
458 %:
459
460=== modified file 'tests/qmltests/CMakeLists.txt'
461--- tests/qmltests/CMakeLists.txt 2014-06-30 15:36:05 +0000
462+++ tests/qmltests/CMakeLists.txt 2014-07-07 15:47:31 +0000
463@@ -6,7 +6,7 @@
464 set(qmltest_DEFAULT_PROPERTIES "")
465
466 set(qmltest_DEFAULT_IMPORT_PATHS
467- ${CMAKE_SOURCE_DIR}
468+ ${CMAKE_BINARY_DIR}
469 ${CMAKE_BINARY_DIR}/tests/utils/modules
470 )
471

Subscribers

People subscribed via source and target branches

to all changes: