← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr

« back to all changes in this revision

Viewing changes to tests/unit_x11/layout_dependency.pri

  • Committer: Gerry Boland
  • Date: 2015-07-27 12:05:54 UTC
  • mfrom: (1000.531.33 staging)
  • Revision ID: gerry.boland@canonical.com-20150727120554-u42hs5dkn1rshnfo
Merge staging and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit_x11/layout_dependency.pri
1
 
LAYOUT_SRC = $$PWD/../../modules/Ubuntu/Layouts
2
 
LAYOUT_BLD = $$shadowed($$PWD)/../../modules/Ubuntu/Layouts
 
1
LAYOUT_SRC = $$PWD/../../src/Ubuntu/Layouts
 
2
LAYOUT_BLD = $$shadowed($$PWD)/../../qml/Ubuntu/Layouts
3
3
 
4
4
INCLUDEPATH += $$LAYOUT_SRC/plugin
5
5
PRE_TARGETDEPS = $$LAYOUT_BLD/libUbuntuLayouts.so