From 0bfea6bdbcce79178c32664153d553ef91df88f0 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sat, 28 Jul 2018 23:27:52 +0200 Subject: [PATCH] . --- .../auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp | 8 +++++--- .../serviceregistrytestplugin.pro | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp b/tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp index afea0d2..3629144 100644 --- a/tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp +++ b/tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp @@ -163,10 +163,12 @@ void ServiceRegistryTest::testPluginRegistration() QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.so"))); #elif defined(Q_OS_DARWIN) QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dylib"))); - QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin_debug.dylib"))); #elif defined(Q_OS_WIN) - QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dll"))); - QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugind.dll"))); +#ifdef QT_NO_DEBUG + QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugin.dll"))); +#else + QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugind.dll"))); +#endif #endif qputenv("QT_PLUGIN_PATH", PLUGIN_TESTDIR); diff --git a/tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro b/tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro index 5995303..7439a69 100644 --- a/tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro +++ b/tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro @@ -5,7 +5,7 @@ QT = core mvvmcore load(qt_build_paths) -TARGET = serviceregistry_testplugin +TARGET = $$qtLibraryTarget(serviceregistry_testplugin) DESTDIR = $$MODULE_BASE_OUTDIR/tests/plugins/serviceregistry HEADERS += \