diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt index 592b8632fab..2bbd361e9d1 100644 --- a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(lib) add_subdirectory(staticplugin) add_subdirectory(theplugin) add_subdirectory(tst) -if(UNIX AND NOT ANDROID AND NOT APPLE) +if(UNIX AND NOT ANDROID AND NOT APPLE AND NOT CYGWIN) add_subdirectory(almostplugin) endif() if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 50bfc314ce3..931dce3de6e 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -26,7 +26,7 @@ if (UNIX) if(NOT APPLE) add_dependencies(tst_qpluginloader theoldplugin) endif() - if (NOT ANDROID AND NOT APPLE) + if (NOT ANDROID AND NOT APPLE AND NOT CYGWIN) add_dependencies(tst_qpluginloader almostplugin) endif() endif() diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp index c5a5bb40b8e..cb263f09b38 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp @@ -289,7 +289,7 @@ void tst_QPluginLoader::errorString() // A bug in QNX causes the test to crash on exit after attempting to load // a shared library with undefined symbols (tracked as QTBUG-114682). -#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) +#if defined(Q_OF_ELF) && !defined(Q_OS_QNX) { QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);