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

cmake: we need two different qmyserver names

Browse Source 
All the binaries now end up in bin/ and since the two qmyservers used
for testing dbus have slightly different implementations we need both,
so rename one to qmyserver_qdbusinterface

Change-Id: I1db1aa8f96f35c6ca41254295e2477c35f915850
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
This commit is contained in:
Albert Astals Cid 2019-02-11 11:51:47 +01:00
parent 99e14037e2
commit 3e784f2be0
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
View File

@ -15,5 +15,3 @@ add_qt_executable(qmyserver_qdbusinterface
Qt::Core
Qt::DBus
)
set_target_properties(qmyserver_qdbusinterface PROPERTIES OUTPUT_NAME qmyserver)

2
tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
View File

@ -270,7 +270,7 @@ void tst_QDBusInterface::initTestCase()
# define EXE ""
#endif
proc.setProcessChannelMode(QProcess::ForwardedErrorChannel);
proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE));
proc.start(QFINDTESTDATA("qmyserver/qmyserver_qdbusinterface" EXE)); // FIXME CMake: This is most probably wrong now since the binary ends up in bin/ not in the build tree
QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
QVERIFY(proc.waitForReadyRead());