Browse Source

.

pull/2/head
Skycoder42 7 years ago
parent
commit
0bfea6bdbc
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 8
      tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp
  2. 2
      tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro

8
tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp

@ -163,10 +163,12 @@ void ServiceRegistryTest::testPluginRegistration()
QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.so"))); QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.so")));
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dylib"))); 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) #elif defined(Q_OS_WIN)
QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dll"))); #ifdef QT_NO_DEBUG
QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugind.dll"))); QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugin.dll")));
#else
QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugind.dll")));
#endif
#endif #endif
qputenv("QT_PLUGIN_PATH", PLUGIN_TESTDIR); qputenv("QT_PLUGIN_PATH", PLUGIN_TESTDIR);

2
tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro

@ -5,7 +5,7 @@ QT = core mvvmcore
load(qt_build_paths) load(qt_build_paths)
TARGET = serviceregistry_testplugin TARGET = $$qtLibraryTarget(serviceregistry_testplugin)
DESTDIR = $$MODULE_BASE_OUTDIR/tests/plugins/serviceregistry DESTDIR = $$MODULE_BASE_OUTDIR/tests/plugins/serviceregistry
HEADERS += \ HEADERS += \

Loading…
Cancel
Save