Skip to content

Commit 1c148e5

Browse files
committed
generalize test
1 parent 7259c01 commit 1c148e5

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

tests/auto/autoupdatercore/UpdaterTest/UpdaterTest.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ SOURCES += tst_updatertest.cpp \
1919
installercontroller.cpp
2020
DEFINES += SRCDIR=\\\"$$PWD/\\\"
2121
DEFINES += BINDIR=\\\"$$[QT_INSTALL_BINS]/../../../Tools/QtInstallerFramework/2.0/bin/\\\"
22+
DEFINES += QTDIR=\\\"$$[QT_INSTALL_BINS]/../../../\\\"
2223

2324
HEADERS += \
2425
installercontroller.h

tests/auto/autoupdatercore/UpdaterTest/tst_updatertest.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,7 @@ void UpdaterTest::testUpdateCheck_data()
8686

8787
updates.clear();
8888

89-
#ifdef Q_OS_WIN
90-
path = "C:/Qt";
91-
#else
92-
path = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Qt";
93-
#endif
94-
QTest::newRow("Qt") << path + "/MaintenanceTool"
89+
QTest::newRow("Qt") << QTDIR + QStringLiteral("MaintenanceTool")
9590
<< false
9691
<< updates;
9792
}

0 commit comments

Comments
 (0)