1 files changed, 9 insertions, 3 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index af4bf4b83a..3818d517b6 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qstring.h>
-#include <qt_windows.h>
+#include <qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,13 +62,20 @@ class Environment
 public:
     static Compiler detectCompiler();
     static QString detectQMakeSpec();
-    static bool detectExecutable(const QString &executable);
+    static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
 
     static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
     static QString execute(const QString &command, int *returnCode = 0);
     static bool cpdir(const QString &srcDir, const QString &destDir);
     static bool rmdir(const QString &name);
 
+    static QString findFileInPaths(const QString &fileName, const QStringList &paths);
+    static QStringList path();
+
+    static QString detectDirectXSdk();
+    static QStringList headerPaths(Compiler compiler);
+    static QStringList libraryPaths(Compiler compiler);
+
 private:
     static Compiler detectedCompiler;