unity-mir

Merge lp:~gerboland/unity-mir/move-module into lp:unity-mir

  1. move-module
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Ricardo Mendoza
Approved revision: 75
Merged at revision: 75
Proposed branch: lp:~gerboland/unity-mir/move-module
Merge into: lp:unity-mir
Diff against target: 12 lines (+1/-1)
1 file modified
src/modules/Unity/Application/Application.pro (+1/-1)
To merge this branch: bzr merge lp:~gerboland/unity-mir/move-module
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mir development team Pending
Review via email: mp+184129@code.launchpad.net

Commit message

To prevent QML module collision with QtUbuntu, move it to dedicated directory

Description of the change

To prevent QML module collision with QtUbuntu, move it to dedicated directory

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/Application.pro'
2--- src/modules/Unity/Application/Application.pro 2013-08-30 16:00:46 +0000
3+++ src/modules/Unity/Application/Application.pro 2013-09-05 15:24:21 +0000
4@@ -45,7 +45,7 @@
5 inputarea.h \
6 inputfilterarea.h
7
8-installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
9+installPath = $$[QT_INSTALL_IMPORTS]/Unity-Mir/$$replace(uri, \\., /)
10
11 QML_FILES = qmldir ApplicationImage.qml
12 qml_files.path = $$installPath

Subscribers

People subscribed via source and target branches