From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 10 Nov 2011 05:56:29 +0000 (+1000)
Subject: Fix qmlplugindump test on mac.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=851412e58ee70d76ecf405d113a1d29d82157e53;p=konrad%2Fqtdeclarative.git

Fix qmlplugindump test on mac.

Change-Id: I939e4cccc34dd8807e3dd4e4a2eb43d4653a14e2
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
---

diff --git a/tests/auto/declarative/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/declarative/qmlplugindump/tst_qmlplugindump.cpp
index 234d4bc..57e3abb 100644
--- a/tests/auto/declarative/qmlplugindump/tst_qmlplugindump.cpp
+++ b/tests/auto/declarative/qmlplugindump/tst_qmlplugindump.cpp
@@ -66,10 +66,16 @@ tst_qmlplugindump::tst_qmlplugindump()
 
 void tst_qmlplugindump::initTestCase()
 {
-    qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlplugindump");
-#ifdef Q_OS_WIN
-    qmlplugindumpPath += QLatin1String(".exe");
+    qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+
+#if defined(Q_OS_MAC)
+    qmlplugindumpPath += QLatin1String("/qmlplugindump.app/Contents/MacOS/qmlplugindump");
+#elif defined(Q_OS_WIN)
+    qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
+#else
+    qmlplugindumpPath += QLatin1String("/qmlplugindump");
 #endif
+
     if (!QFileInfo(qmlplugindumpPath).exists()) {
         QString message = QString::fromLatin1("qmlplugindump executable not found (looked for %0)")
                 .arg(qmlplugindumpPath);