diff options
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) { |