diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-08-18 09:16:40 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-08-21 08:29:37 +0200 |
| commit | 4906b43b0055aef027a43044c22374a5fc31df44 (patch) | |
| tree | 68e3641d8d37f3f34ea5b09c7a4047c832b7ee89 /src/corelib/io/qdir.h | |
| parent | 48c5780d5f804fb001525438ef576f61897b196f (diff) | |
QCoreGlobalData: remove
Inline the data members into the only remaining user (qdir.cpp) and
remove the class.
As a drive-by, fix the non-idiomatic use of QT_BUILD_CORE_LIB to mean
!QT_BOOTSTRAPPED and apply the guard consistently to the declaration,
too.
Pick-to: 6.4 6.3 6.2
Fixes: QTBUG-105747
Change-Id: If2c780dd96e2a2e331cabdc42fd920874e7737b0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/io/qdir.h')
| -rw-r--r-- | src/corelib/io/qdir.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index ba03686f85..b516777fb8 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -112,6 +112,7 @@ public: { return QtPrivate::toFilesystemPath(canonicalPath()); } #endif // QT_CONFIG(cxx17_filesystem) +#ifndef QT_BOOTSTRAPPED static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); #ifdef Q_CLANG_QDOC @@ -124,6 +125,7 @@ public: } #endif // QT_CONFIG(cxx17_filesystem) static QStringList searchPaths(const QString &prefix); +#endif // QT_BOOTSTRAPPED QString dirName() const; QString filePath(const QString &fileName) const; |