From 85161946337c25b1d23d661d4d748ab0270db2f4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 28 Feb 2012 14:49:19 +0100
Subject: 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>
---
 qmake/option.h | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'qmake')

diff --git a/qmake/option.h b/qmake/option.h
index b8a3b561fa..b812f14a49 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -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
-- 
cgit v1.2.3