don't duplicate QLibraryInfo declaration
there is no reason for doing that. there is even reason for *not* doing it (the enums running out of sync). Change-Id: Ieb7d015ca497a6675cc85da4c2e0af0c1533dd7a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
e1cc0d6bbc
commit
8516194633
@ -46,6 +46,7 @@
|
||||
#include <qstring.h>
|
||||
#include <qstringlist.h>
|
||||
#include <qfile.h>
|
||||
#include <qlibraryinfo.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@ -216,28 +217,6 @@ private:
|
||||
inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }
|
||||
inline QStringList splitPathList(const QString &paths) { return paths.split(Option::dirlist_sep); }
|
||||
|
||||
// this is a stripped down version of the one found in QtCore
|
||||
class QLibraryInfo
|
||||
{
|
||||
public:
|
||||
enum LibraryLocation
|
||||
{
|
||||
PrefixPath,
|
||||
DocumentationPath,
|
||||
HeadersPath,
|
||||
LibrariesPath,
|
||||
BinariesPath,
|
||||
PluginsPath,
|
||||
DataPath,
|
||||
TranslationsPath,
|
||||
SettingsPath,
|
||||
ExamplesPath,
|
||||
ImportsPath,
|
||||
TestsPath
|
||||
};
|
||||
static QString location(LibraryLocation);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // OPTION_H
|
||||
|
Loading…
x
Reference in New Issue
Block a user