← Back to branch summary

~nskaggs/ubuntu-ui-toolkit/add-popover-object-support

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/plugin/uctheme.cpp

  • Committer: CI bot
  • Author(s): Zsombor Egri, Tarmac, Zoltán Balogh
  • Date: 2014-06-18 17:10:31 UTC
  • mfrom: (1000.76.9 landing_04-06)
  • Revision ID: ps-jenkins@lists.canonical.com-20140618171031-1s026ulaxymh2e9f
  [Leo Arias ]
  * On the autopilot helper for the header, fix the swipe to show
    when hidden.
  * Added a fixture for autopilot tests to use a fake home directory.
    Fixes: https://bugs.launchpad.net/bugs/1317639
  * Cleaned the containers in unity test using the alternate
    launcher.

  [ Christian Dywan ]   
  * Add a launcher with a switch for the QQMLEngine.

  [ Tim Peeters ]
  * Anchor the internal PageTreeNode of PageStack to fill its parent.
    Fixes: https://bugs.launchpad.net/bugs/1322527
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/plugin/uctheme.cpp
81
81
    QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
82
82
    if (pathList.isEmpty()) {
83
83
        // get the default path list from generic data location, which contains
84
 
        // ~/.local/share and XDG_DATA_DIRS
 
84
        // XDG_DATA_DIRS
 
85
        QString xdgDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
 
86
        if (!xdgDirs.isEmpty()) {
 
87
            pathList << xdgDirs.split(':', QString::SkipEmptyParts);
 
88
        }
 
89
        // ~/.local/share
85
90
        pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
86
91
    }
87
92
    // fix folders