diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
| commit | 5fc1013753babd397efbe5b7bae0dac387fbc2fd (patch) | |
| tree | 3a5ccd5b15397879ae4ec26a8708b5ee2d86dc15 /src/corelib/plugin/qlibrary.cpp | |
| parent | 20cfe1e790295254370cf472df39813f864de7ea (diff) | |
| parent | e4bec39a139363d1ee4cf3fb15a3fe4499215e77 (diff) | |
| download | Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.zip Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.gz Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.bz2 | |
Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 2b463a1..6496876 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -659,7 +659,10 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) #endif if (!pHnd) { #ifdef Q_OS_WIN + //avoid 'Bad Image' message box + UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); hTempModule = ::LoadLibraryEx((wchar_t*)QDir::toNativeSeparators(fileName).utf16(), 0, DONT_RESOLVE_DLL_REFERENCES); + SetErrorMode(oldmode); #else # if defined(Q_OS_SYMBIAN) //Guard against accidentally trying to load non-plugin libraries by making sure the stub exists |