← Back to branch summary

~mzanetti/unity8/fix-left-edge-on-spread

« back to all changes in this revision

Viewing changes to include/paths.h.in

  • Committer: Michael Zanetti
  • Date: 2015-01-12 11:21:17 UTC
  • mfrom: (1459.1.85 unity8)
  • Revision ID: michael.zanetti@canonical.com-20150112112117-0x9srs9dx0ndp60g
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/paths.h.in
71
71
    QStringList paths;
72
72
    if (isRunningInstalled()) {
73
73
        paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
 
74
        paths << QString("@USS_PRIVATE_PLUGINDIR@");
74
75
        paths << QString("@SHELL_PLUGINDIR@");
75
76
        paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
76
77
    } else {
 
78
        paths << QString("@USS_PRIVATE_PLUGINDIR@");
77
79
        paths << QString("@SHELL_PLUGINDIR@");
78
80
        paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
79
81
    }