git.iko.soy/unity8
on xenial help sign in
Generate the qmltypes files without a full path being stored inside them.
16d28a9Rodney Dawes
cmake/modules/QmlPlugins.cmake+6−2
compare with xenial
unifiedsplit
@@ -111,10 +111,13 @@ macro(export_qmlplugin PLUGIN VERSION PATH)
111 set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
111 set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
112 else()
112 else()
113 # Find import path to point qmlplugindump at
113 # Find import path to point qmlplugindump at
114− string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
114+ string(REGEX REPLACE "/${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
115 set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
115 set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
116 endif()
116 endif()
117
117
118+ # Relative path for the module
119+ string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")
120+
118 # Find the last segment of the plugin name to use as qmltypes basename
121 # Find the last segment of the plugin name to use as qmltypes basename
119 string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
122 string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
120 set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
123 set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
@@ -122,7 +125,8 @@ macro(export_qmlplugin PLUGIN VERSION PATH)
122
125
123 add_custom_target(${target_prefix}-qmltypes
126 add_custom_target(${target_prefix}-qmltypes
124 COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
127 COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
125− ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
128+ ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
129+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
126 )
130 )
127 add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
131 add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
128 add_dependencies(qmltypes ${target_prefix}-qmltypes)
132 add_dependencies(qmltypes ${target_prefix}-qmltypes)
plugins/AccountsService/AccountsService.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable AccountsService 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Dash/Dash.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Dash 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Dash 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/HudClient/HudClient.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable HudClient 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable HudClient 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/LightDM/LightDM.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable LightDM 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Powerd/Powerd.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Powerd 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Powerd 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/SessionBroadcast/SessionBroadcast.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Ubuntu/Gestures/Gestures.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Unity/Indicators/Indicators.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Unity/Launcher/Launcher.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Unity/Session/Session.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Session 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Unity.Session 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
plugins/Utils/Utils.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Utils 0.1 /home/michal/dev/canonical/unity8/repo/builddir/plugins/'
7+// 'qmlplugindump -notrelocatable Utils 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/AccountsService/AccountsService.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable AccountsService 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable AccountsService 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/GSettings.1.0/GSettings.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable GSettings 1.0 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable GSettings 1.0 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/HudClient/HudClient.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable HudClient 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable HudClient 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/LightDM/LightDM.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable LightDM 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Powerd/Powerd.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Powerd 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Powerd 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/QMenuModel/QMenuModel.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable QMenuModel 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable QMenuModel 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/QtMultimedia/QtMultimedia.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable QtMultimedia 5.0 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable QtMultimedia 5.0 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Ubuntu/Thumbnailer/Thumbnailer.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Thumbnailer 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Ubuntu.Thumbnailer 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Unity/Application/Application.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Application 0.1 /home/michal/dev/canonical/unity8/repo/builddir/nonmirplugins'
7+// 'qmlplugindump -notrelocatable Unity.Application 0.1 nonmirplugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Unity/Indicators/Indicators.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Unity/Launcher/Launcher.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/mocks/Unity/Notifications/Notifications.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Notifications 1.0 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Unity.Notifications 1.0 tests/mocks'
8
8
9Module {
9Module {
10}
10}
tests/mocks/Unity/Unity.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity 0.2 /home/michal/dev/canonical/unity8/repo/builddir/tests/mocks/'
7+// 'qmlplugindump -notrelocatable Unity 0.2 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
tests/utils/modules/Unity/Test/Test.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Test 0.1 /home/michal/dev/canonical/unity8/repo/builddir/tests/utils/modules/'
7+// 'qmlplugindump -notrelocatable Unity.Test 0.1 tests/utils/modules'
8
8
9Module {
9Module {
10 Component {
10 Component {