Don't complain about non-matching Qt versions in qwidget.cpp
Commit 5bf67f5f41
did it for qobject.cpp,
but I missed qwidget.cpp (I hadn't realized the test existed there too).
Change-Id: Ib056b47dde3341ef9a52ffff13eeceafcfc64893
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
parent
0d9db5821c
commit
8485fe9af8
@ -289,8 +289,15 @@ QWidgetPrivate::QWidgetPrivate(int version)
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef QT_BUILD_INTERNAL
|
||||
// Don't check the version parameter in internal builds.
|
||||
// This allows incompatible versions to be loaded, possibly for testing.
|
||||
Q_UNUSED(version);
|
||||
#else
|
||||
if (version != QObjectPrivateVersion)
|
||||
qFatal("Cannot mix incompatible Qt libraries");
|
||||
qFatal("Cannot mix incompatible Qt library (version 0x%x) with this library (version 0x%x)",
|
||||
version, QObjectPrivateVersion);
|
||||
#endif
|
||||
|
||||
isWidget = true;
|
||||
memset(high_attributes, 0, sizeof(high_attributes));
|
||||
|
Loading…
Reference in New Issue
Block a user