diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
| commit | a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (patch) | |
| tree | dd0742d8d8f1ac20b78a5142b81a78ad89158b5c /src/corelib/plugin | |
| parent | 58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff) | |
| parent | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (diff) | |
| download | Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.zip Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.gz Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.bz2 | |
Merge remote-tracking branch 'qt-qa-review/master'
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index f1ed8e4..e0e2b8d 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -789,7 +789,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) // An exception was thrown when calling qt_plugin_query_verification_data(). // This usually happens when plugin is compiled with the /clr compiler flag, // & will only work if the dependencies are loaded & DLLMain() is called. - // LoadLibrary() will do this, try once with this & if it fails dont load. + // LoadLibrary() will do this, try once with this & if it fails don't load. retryLoadLibrary = !retryLoadLibrary; } #endif |