diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-12-04 09:03:36 (GMT) |
| commit | 6001ef3bb9cdf41c5375a22cdaee85fffdf3b644 (patch) | |
| tree | f37a69fc24d84522a0cb388802a38022a3cd9943 /src/corelib/plugin | |
| parent | d1a28d167295958a4404fab37d60ef530c692590 (diff) | |
| parent | d7b34583926e3bd751120a4b827cd5ba6667dea3 (diff) | |
| download | Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.zip Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.gz Qt-6001ef3bb9cdf41c5375a22cdaee85fffdf3b644.tar.bz2 | |
Merge commit 'oslo-staging-1/4.6' into master-mainline
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 1298a11..77308ea 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -760,7 +760,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) pluginState = IsNotAPlugin; // be pessimistic - if ((qt_version > QT_VERSION) || ((QT_VERSION & 0xff0000) > (qt_version & 0xff0000))) { + if ((qt_version & 0x00ff00) > (QT_VERSION & 0x00ff00) || (qt_version & 0xff0000) != (QT_VERSION & 0xff0000)) { if (qt_debug_component()) { qWarning("In %s:\n" " Plugin uses incompatible Qt library (%d.%d.%d) [%s]", |