Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

1 files changed, 1 insertions, 22 deletions

diff --git a/qmake/option.h b/qmake/option.h
index 2d0d1114a9..23384877fd 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
 
@@ -219,28 +220,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