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.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.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index 4d7e359117..ccf2565fc0 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -44,8 +44,11 @@ #include <qdir.h> #include <qfileinfo.h> #include <qhash.h> + +#ifndef QT_BOOTSTRAPPED #include <qobject.h> #include <qcoreapplication.h> +#endif #ifndef QT_NO_STANDARDPATHS @@ -300,7 +303,7 @@ QString QStandardPaths::findExecutable(const QString &executableName, const QStr an empty QString if no relevant location can be found. */ -#ifndef Q_OS_MAC +#if !defined(Q_OS_MAC) && !defined(QT_BOOTSTRAPPED) QString QStandardPaths::displayName(StandardLocation type) { switch (type) { |