← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to src/applicationinfo.cpp

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/applicationinfo.cpp
6
6
#include <QLocale>
7
7
#include <QDesktopServices>
8
8
#include <QMessageBox>
 
9
#ifdef HAVE_QT5
 
10
#include <QStandardPaths>
 
11
#endif
9
12
 
10
13
#ifdef HAVE_X11
11
14
#include <sys/stat.h> // chmod
236
239
                                }
237
240
                                dataDir_ = configDir_;
238
241
                                // prefer non-roaming data location for cache which is default for qds:DataLocation
 
242
#ifdef HAVE_QT5
 
243
                                cacheDir_ = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
 
244
#else
239
245
                                cacheDir_ = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
 
246
#endif
240
247
                        } else {
241
248
                                configDir_ = dataDir_ = cacheDir_ = base + "/" + name();
242
249
                        }