diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-26 13:13:03 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 15:18:44 +0100 |
| commit | a025a2fcfa70e5db99411e2ec73c0a5141619ff5 (patch) | |
| tree | 4afca3b2f038b174910d632c8563be343218b14d /src/corelib/io/qstandardpaths_unix.cpp | |
| parent | 300534fc214f2547a63594ce0891e9a54c8f33ca (diff) | |
Allow QStandardPaths (Mac, Windows, Unix) to be bootstrapped
This allows using QStandardPaths in one of the bootstrapped tools, if
required for a future need.
The Blackberry version appears to be usable in bootstrapped mode
already.
Change-Id: Ia4e9b9564395d2e151f8ac229ac2a2aa2982e92f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/io/qstandardpaths_unix.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths_unix.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp index 822c687c89..3fb36589d2 100644 --- a/src/corelib/io/qstandardpaths_unix.cpp +++ b/src/corelib/io/qstandardpaths_unix.cpp @@ -44,23 +44,30 @@ #include <qfile.h> #include <qhash.h> #include <qtextstream.h> -#include <qcoreapplication.h> #include <private/qfilesystemengine_p.h> #include <errno.h> #include <stdlib.h> +#ifndef QT_BOOTSTRAPPED +#include <qcoreapplication.h> +#endif + #ifndef QT_NO_STANDARDPATHS QT_BEGIN_NAMESPACE static void appendOrganizationAndApp(QString &path) { +#ifndef QT_BOOTSTRAPPED const QString org = QCoreApplication::organizationName(); if (!org.isEmpty()) path += QLatin1Char('/') + org; const QString appName = QCoreApplication::applicationName(); if (!appName.isEmpty()) path += QLatin1Char('/') + appName; +#else + Q_UNUSED(path); +#endif } QString QStandardPaths::writableLocation(StandardLocation type) @@ -141,6 +148,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) break; } +#ifndef QT_BOOTSTRAPPED // http://www.freedesktop.org/wiki/Software/xdg-user-dirs QString xdgConfigHome = QFile::decodeName(qgetenv("XDG_CONFIG_HOME")); if (xdgConfigHome.isEmpty()) @@ -199,6 +207,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) } } } +#endif QString path; switch (type) { |