Skip to content

Commit 1e3aa83

Browse files
committed
fix paths
1 parent 62f75a4 commit 1e3aa83

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

tests/auto/plugins/QtIfwTest/QtIfwTest.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ DISTFILES += \
2323
isEmpty(QT_IFW_VERSION): QT_IFW_VERSION = 3.2
2424
isEmpty(QT_TOOL_PATH): QT_TOOL_PATH = $$[QT_INSTALL_BINS]/../../../Tools
2525

26-
DEFINES += SRCDIR=\\\"$$PWD/\\\"
27-
DEFINES += BINDIR=\\\"$$clean_path($$QT_TOOL_PATH/QtInstallerFramework/$$QT_IFW_VERSION/bin/)\\\"
28-
DEFINES += QTDIR=\\\"$$[QT_INSTALL_BINS]/../../../\\\"
26+
DEFINES += SRCDIR=\\\"$$PWD\\\"
27+
DEFINES += BINDIR=\\\"$$clean_path($$QT_TOOL_PATH/QtInstallerFramework/$$QT_IFW_VERSION/bin)\\\"
28+
DEFINES += QTDIR=\\\"$$[QT_INSTALL_BINS]/../../..\\\"
2929

3030
include($$PWD/../testlib/testlib.pri)
3131

tests/auto/plugins/QtIfwTest/installercontroller.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <QtTest>
55
#include <plugintest.h>
66

7-
static const QString configFile = QStringLiteral(SRCDIR) + QStringLiteral("installer/config/config.xml");
8-
static const QString configScript = QStringLiteral(SRCDIR) + QStringLiteral("installer/config/controller.qs");
9-
static const QString pkgFile = QStringLiteral(SRCDIR) + QStringLiteral("installer/packages/de.skycoder42.QtAutoUpdaterTestInstaller/meta/package.xml");
10-
static const QString binarycreator = QStringLiteral(BINDIR) + QStringLiteral("binarycreator");
11-
static const QString repogen = QStringLiteral(BINDIR) + QStringLiteral("repogen");
7+
static const QString configFile = QStringLiteral(SRCDIR) + QStringLiteral("/installer/config/config.xml");
8+
static const QString configScript = QStringLiteral(SRCDIR) + QStringLiteral("/installer/config/controller.qs");
9+
static const QString pkgFile = QStringLiteral(SRCDIR) + QStringLiteral("/installer/packages/de.skycoder42.QtAutoUpdaterTestInstaller/meta/package.xml");
10+
static const QString binarycreator = QStringLiteral(BINDIR) + QStringLiteral("/binarycreator");
11+
static const QString repogen = QStringLiteral(BINDIR) + QStringLiteral("/repogen");
1212

1313
InstallerController::InstallerController(QObject *parent) :
1414
QObject{parent}

0 commit comments

Comments
 (0)