diff --git a/examples/mainwindows/mdi/mdi.pro b/examples/mainwindows/mdi/mdi.pro index 90c103a..86f46db 100644 --- a/examples/mainwindows/mdi/mdi.pro +++ b/examples/mainwindows/mdi/mdi.pro @@ -4,7 +4,7 @@ SOURCES = main.cpp \ mainwindow.cpp \ mdichild.cpp RESOURCES = mdi.qrc - +CONFIG+=console # install target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 6288947..ec131ea 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -143,6 +143,7 @@ void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings) qDebug() << "QFactoryLoader::QFactoryLoader() looking at" << fileName; } library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath()); + qDebug() << __FUNCTION__ << library->fileName << library->isPlugin(&settings); if (!library->isPlugin(&settings)) { if (qt_debug_component()) { qDebug() << library->errorString; @@ -211,10 +212,13 @@ void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings) keysUsed++; } } - if (keysUsed) + if (keysUsed) { d->libraryList += library; - else + qDebug() << library->fileName << " provides key, using"; + }else { + qDebug() << library->fileName << " releasing"; library->release(); + } } } diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index 8b77e00..9558580 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -45,6 +45,7 @@ #include "qdir.h" #include "qfileinfo.h" #include "qdir.h" +#include "qdebug.h" #include #if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) @@ -94,6 +95,8 @@ bool QLibraryPrivate::load_sys() // NB If it's a plugin we do not ever try the ".dll" extension QStringList attempts; QFileSystemEntry fsEntry(fileName); + qDebug() << fileName; + if (loadHints & QLibrary::ImprovedSearchHeuristics) { if (pluginState != IsAPlugin) attempts.append(fileName + QLatin1String(".dll")); @@ -149,11 +152,13 @@ bool QLibraryPrivate::load_sys() else qualifiedFileName = dir.filePath(moduleFileName); } + qDebug() << __FUNCTION__ << qualifiedFileName; return (pHnd != 0); } bool QLibraryPrivate::unload_sys() { + qDebug() << __FUNCTION__ <