Commit 79ca107a authored by Thomas Hartmann's avatar Thomas Hartmann

Test.QmlDesigner: fix for windows

On Windows the exectuable is in either the debug/ or release/
subdirectory.

Change-Id: Ic4a155a5d0cd5024c3d8aedf86e8def094a2a84e
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent 938612c3
......@@ -76,6 +76,17 @@
#include <QMessageBox>
namespace {
static QLatin1String qmlPuppetApplicationDirectoryForTests()
{
#ifdef Q_OS_WIN
//one more - debug/release dir
return QLatin1String("/../../../../../../bin/");
#else
return QLatin1String("/../../../../../bin/");
#endif
}
} //namespace
namespace QmlDesigner {
......@@ -114,8 +125,8 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
QString applicationPath = pathToQt + QLatin1String("/bin");
if (runModus == TestModus) {
applicationPath = QCoreApplication::applicationDirPath()
+ QLatin1String("/../../../../../bin/")
+ qmlPuppetApplicationName();
+ qmlPuppetApplicationDirectoryForTests()
+ qmlPuppetApplicationName();
} else {
applicationPath = macOSBundlePath(applicationPath);
applicationPath += QLatin1Char('/') + qmlPuppetApplicationName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment