← Back to branch summary

~ci-train-bot/address-book-app/address-book-app-ubuntu-yakkety-1866

« back to all changes in this revision

Viewing changes to src/app/addressbookapp.cpp

  • Committer: Bileto Bot
  • Date: 2016-08-02 13:29:19 UTC
  • mfrom: (602.3.4 address-book-app)
  • Revision ID: ci-train-bot@canonical.com-20160802132919-agv72abv62d98zqv
Resync trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/addressbookapp.cpp
64
64
{
65
65
    QString result;
66
66
    QString appPath = QCoreApplication::applicationDirPath();
67
 
    if (appPath.startsWith(ADDRESS_BOOK_DEV_BINDIR)) {
 
67
    if (qEnvironmentVariableIsSet(SNAP_PATH)) {
 
68
        result = qgetenv(SNAP_PATH) + QStringLiteral("/share/address-book-app/") + fileName;
 
69
    } else if (appPath.startsWith(ADDRESS_BOOK_DEV_BINDIR)) {
68
70
        result = QString(ADDRESS_BOOK_APP_DEV_DATADIR) + fileName;
69
71
    } else if (clickModeEnabled()) {
70
72
        result = appPath + QStringLiteral("/share/address-book-app/") + fileName;