From 7beeb932fd5cbe4e213a755001f784508a63572d Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Mon, 16 Jan 2012 10:52:49 +1000
Subject: Changed qsharedpointer unittest to use build qmake over system one.

- If we can find the qmake belonging to the build, use that instead
  of qmake from the PATH for compiling subtests.

Change-Id: I9445754bb02dab11c3e1bbe9dc459ecc682689a4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tests/auto/corelib/tools')

diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index c7ffe8cb7b..2e3dd0699d 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
@@ -52,6 +52,7 @@
 #include <QtCore/QDirIterator>
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
+#include <QtCore/QLibraryInfo>
 
 #ifndef DEFAULT_MAKESPEC
 # error DEFAULT_MAKESPEC not defined
@@ -565,7 +566,17 @@ namespace QTest {
              << makespec()
              << QLatin1String("project.pro");
         qmake.setWorkingDirectory(temporaryDirPath);
-        qmake.start(QLatin1String("qmake"), args);
+
+        QString cmd = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake";
+#ifdef Q_OS_WIN
+        cmd.append(".exe");
+#endif
+        if (!QFile::exists(cmd)) {
+            cmd = "qmake";
+            qWarning("qmake from build not found, fallback to PATH's qmake");
+        }
+
+        qmake.start(cmd, args);
 
         std_out += "### --- stdout from qmake --- ###\n";
         std_err += "### --- stderr from qmake --- ###\n";
-- 
cgit v1.2.3