diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-02 15:30:03 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-02 15:46:40 (GMT) |
| commit | ba805d5e1a03824c75c4d17131063be1b0fd68a1 (patch) | |
| tree | 93ebb2b45d9e408de96eb5ced7683dcc26e6f9c4 | |
| parent | 67f99a1901231b987ee1da699a7f52302ecca5fe (diff) | |
| download | Qt-ba805d5e1a03824c75c4d17131063be1b0fd68a1.zip Qt-ba805d5e1a03824c75c4d17131063be1b0fd68a1.tar.gz Qt-ba805d5e1a03824c75c4d17131063be1b0fd68a1.tar.bz2 | |
Don't look at the patch-level number when loading plugins.
Qt claims that it maintains forwards and backwards binary compatibility
within the same Qt minor series. So it should be safe to load a plugin
built with Qt 4.6.2 on Qt 4.6.1.
Reviewed-by: Bradley T. Hughes
| -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 6496876..ea0254b 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -744,7 +744,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]", |