diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-15 14:25:34 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-17 11:57:11 +0100 |
| commit | 6fb569af9512f63d503720ed7f62e9c70b16f969 (patch) | |
| tree | 7a49c1fa32c064aeaefaa9ebec2c695c2fa275ad /qmake/qmakelibraryinfo.h | |
| parent | a423c0d21174fc88a02277d9cd909b0d6e11018b (diff) | |
Unify QLibraryInfo settings
Exporting QLibraryInfo internals allows to reuse settings in
qmake/qtpath without having to keep its own instance.
Also there is no need to check setting groups in QLibraryInfo
except the 'Paths' group, since this logic belongs to qmake/qtpaths
only.
Change-Id: If762defba025ad7f7489f8a86ef5768a8628bd2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake/qmakelibraryinfo.h')
| -rw-r--r-- | qmake/qmakelibraryinfo.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/qmake/qmakelibraryinfo.h b/qmake/qmakelibraryinfo.h index 896181493c..71cc3fc78a 100644 --- a/qmake/qmakelibraryinfo.h +++ b/qmake/qmakelibraryinfo.h @@ -50,10 +50,7 @@ class QSettings; struct QMakeLibraryInfo { - static QSettings *findConfiguration(); - static QSettings *configuration(); static QString path(int loc); - static QStringList platformPluginArguments(const QString &platformName); /* This enum has to start after the last value in QLibraryInfo::LibraryPath(NOT SettingsPath!). * See qconfig.cpp.in and QLibraryInfo for details. @@ -78,12 +75,6 @@ struct QMakeLibraryInfo static void reload(); static bool haveGroup(PathGroup group); static void sysrootify(QString &path); - - static QString binaryAbsLocation; - static QString qtconfManualPath; - -private: - static QString libraryInfoFile(); }; QT_END_NAMESPACE |