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_mac.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_mac.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths_mac.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/io/qstandardpaths_mac.cpp b/src/corelib/io/qstandardpaths_mac.cpp index 20a7dcffd6..068bfb45d5 100644 --- a/src/corelib/io/qstandardpaths_mac.cpp +++ b/src/corelib/io/qstandardpaths_mac.cpp @@ -42,7 +42,10 @@ #include "qstandardpaths.h" #include <qdir.h> #include <private/qcore_mac_p.h> + +#ifndef QT_BOOTSTRAPPED #include <qcoreapplication.h> +#endif #include <ApplicationServices/ApplicationServices.h> @@ -101,12 +104,16 @@ static QString getFullPath(const FSRef &ref) 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 } static QString macLocation(QStandardPaths::StandardLocation type, short domain) @@ -180,6 +187,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) return dirs; } +#ifndef QT_BOOTSTRAPPED QString QStandardPaths::displayName(StandardLocation type) { if (QStandardPaths::HomeLocation == type) @@ -197,5 +205,6 @@ QString QStandardPaths::displayName(StandardLocation type) return static_cast<QString>(displayName); } +#endif QT_END_NAMESPACE |