diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 21:22:35 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 21:22:35 +1000 |
| commit | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (patch) | |
| tree | 484a943b81f79ae74aca22f6370b77dbea8c9050 /src/corelib/plugin | |
| parent | 4b90559d0a8b693241dd79682d0d31362497468b (diff) | |
| parent | 9e88a2f1468b9a4f500b878f514db7f7a1f5eadc (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
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 f1ed8e4fac..e0e2b8d7d6 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 |