From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001 From: Lubos Lunak Date: Wed, 30 Jan 2008 14:24:01 +0100 Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing parts of upstream Qt and qt-copy. In general it is a bad idea to mix e.g. libQtCore from one build and libQtGui from another one, and other qt-copy patches could make changes in Qt internal structures that could cause problems when mixed with upstream Qt. This patch does not make qt-copy binary incompatible with upstream Qt. It only further enforces using the same sources for the whole Qt build. qt-bugs@ issue : none Trolltech task ID : none bugs.kde.org number : none --- src/corelib/kernel/qobject_p.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 0bcccba..88192fd 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set; inline QObjectData::~QObjectData() {} -enum { QObjectPrivateVersion = QT_VERSION }; +// add 0x1000000 to mark it as qt-copy version, with possible modifications +// in some Q*Private class +enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 }; class Q_CORE_EXPORT QObjectPrivate : public QObjectData { -- 1.6.2.5