1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't rely on the right qdbuscpp2xml/qdbusxml2cpp being in PATH

Browse Source 
Change-Id: I50f639632dcb37c9752b41241a21c9fcd9dde0dd
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Oswald Buddenhagen 2015-01-30 19:33:10 +01:00
parent 91a48160d6
commit b91558419b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
View File

@ -134,7 +134,8 @@ void tst_qdbuscpp2xml::qdbuscpp2xml()
}
// Launch
const QString command = QLatin1String("qdbuscpp2xml");
const QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
const QString command = binpath + QLatin1String("/qdbuscpp2xml");
QProcess process;
process.start(command, QStringList() << options << (QFINDTESTDATA(inputfile + QStringLiteral(".h"))));
if (!process.waitForFinished()) {

4
tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
View File

@ -223,8 +223,10 @@ void tst_qdbusxml2cpp::process()
QFETCH_GLOBAL(QString, commandLineArg);
// Run the tool
const QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
const QString command = binpath + QLatin1String("/qdbusxml2cpp");
QProcess process;
process.start("qdbusxml2cpp", QStringList() << commandLineArg << "-" << "-N");
process.start(command, QStringList() << commandLineArg << "-" << "-N");
QVERIFY2(process.waitForStarted(), qPrintable(process.errorString()));
// feed it our XML data