← Back to branch summary

~mterry/unity8/oobe-revert-geonames

« back to all changes in this revision

Viewing changes to include/paths.h.in

  • Committer: Michał Sawicz
  • Date: 2013-12-17 16:04:47 UTC
  • mto: This revision was merged to the branch mainline in revision 600.
  • Revision ID: michal.sawicz@canonical.com-20131217160447-d1inqe0kmfgse2b8
Introduce a qml directory, move all QML, JS and assets, under it, adapt the rest to match.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/paths.h.in
41
41
    }
42
42
}
43
43
 
44
 
inline QString shellAppDirectory() {
 
44
inline QString qmlDirectory() {
45
45
    if (isRunningInstalled()) {
46
46
        return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
47
47
    } else {
48
 
        return QString("@CMAKE_SOURCE_DIR@/");
 
48
        return QString("@CMAKE_SOURCE_DIR@/qml/");
49
49
    }
50
50
}
51
51
 
79
79
    }
80
80
    else {
81
81
        // append so by default we use xdg files.
82
 
        dirs.append(shellAppDirectory());
 
82
        dirs.append(qmlDirectory());
83
83
    }
84
84
    return dirs;
85
85
}