make use of Q_MOC_OUTPUT_REVISION in moc tool

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 8556207..cc1a95c 100644 (file)
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "generator.h"
-#include "outputrevision.h"
 #include "utils.h"
 #include <QtCore/qmetatype.h>
 #include <stdio.h>

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index d809dbd..ae75b68 100644 (file)
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -43,7 +43,6 @@
 #include "generator.h"
 #include "qdatetime.h"
 #include "utils.h"
-#include "outputrevision.h"
 
 // for normalizeTypeInternal
 #include <qmetaobject_p.h>
@@ -780,7 +779,7 @@ void Moc::generate(FILE *out)
         fn = filename.mid(i);
     fprintf(out, "/****************************************************************************\n"
             "** Meta object code from reading C++ file '%s'\n**\n" , fn.constData());
-    fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR);
+    fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , Q_MOC_OUTPUT_REVISION, QT_VERSION_STR);
     fprintf(out, "** WARNING! All changes made in this file will be lost!\n"
             "*****************************************************************************/\n\n");
 
@@ -806,7 +805,7 @@ void Moc::generate(FILE *out)
 
     fprintf(out, "#if !defined(Q_MOC_OUTPUT_REVISION)\n"
             "#error \"The header file '%s' doesn't include <QObject>.\"\n", fn.constData());
-    fprintf(out, "#elif Q_MOC_OUTPUT_REVISION != %d\n", mocOutputRevision);
+    fprintf(out, "#elif Q_MOC_OUTPUT_REVISION != %d\n", Q_MOC_OUTPUT_REVISION);
     fprintf(out, "#error \"This file was generated using the moc from %s."
             " It\"\n#error \"cannot be used with the include files from"
             " this version of Qt.\"\n#error \"(The moc has changed too"

diff --git a/src/tools/moc/mocmain.cpp b/src/tools/moc/mocmain.cpp
index 0052de5..07c5100 100644 (file)
--- a/src/tools/moc/mocmain.cpp
+++ b/src/tools/moc/mocmain.cpp
@@ -41,7 +41,6 @@
 
 #include "preprocessor.h"
 #include "moc.h"
-#include "outputrevision.h"
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
@@ -302,7 +301,7 @@ int runMoc(int _argc, char **_argv)
             if (more && opt != "version")
                 error();
             fprintf(stderr, "Qt Meta Object Compiler version %d (Qt %s)\n",
-                    mocOutputRevision, QT_VERSION_STR);
+                    Q_MOC_OUTPUT_REVISION, QT_VERSION_STR);
             return 1;
         case 'n': // don't display warnings
             if (ignoreConflictingOptions)

diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h
deleted file mode 100644 (file)
index 3c2d98e..0000000
--- a/src/tools/moc/outputrevision.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef OUTPUTREVISION_H
-#define OUTPUTREVISION_H
-
-// if the output revision changes, you MUST change it in qobjectdefs.h too
-enum { mocOutputRevision = 65 };          // moc format output revision
-
-#endif // OUTPUTREVISION_H