Fix compilation of the QObject test

The hardcoded generated include patch was wrong.

Also don't error if the MOC_OUTPUT_REVISION change. The file will
be updated if needed if ever the test start failing.

1 files changed, 5 insertions, 10 deletions

diff --git a/tests/auto/qobject/moc_oldnormalizeobject.cpp b/tests/auto/qobject/moc_oldnormalizeobject.cpp
index 4f590ae..bde9c39 100644
--- a/tests/auto/qobject/moc_oldnormalizeobject.cpp
+++ b/tests/auto/qobject/moc_oldnormalizeobject.cpp
@@ -2,19 +2,14 @@
 ** Meta object code from reading C++ file 'oldnormalizeobject.h'
 **
 ** Created: Wed Nov 18 11:43:05 2009
-**      by: The Qt Meta Object Compiler version 62 (Qt 4.7.0)
+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.0)
 **
-** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
-#include "../../../../../../master/tests/auto/qobject/oldnormalizeobject.h"
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'oldnormalizeobject.h' doesn't include <QObject>."
-#elif Q_MOC_OUTPUT_REVISION != 62
-#error "This file was generated using the moc from 4.7.0. It"
-#error "cannot be used with the include files from this version of Qt."
-#error "(The moc has changed too much.)"
-#endif
+// Yhis file was generated from moc version 4.6 to test binary compatibility
+// It should *not* be generated by the current moc
+
+#include "oldnormalizeobject.h"
 
 QT_BEGIN_MOC_NAMESPACE
 static const uint qt_meta_data_OldNormalizeObject[] = {