Increment private API version and move it into a separate file

The API version should be common to Qml and QmlCompiler and therefore
cannot live in a header specific to Qml.

Change-Id: I033d3925353e02e42886568ea91382a9f2ca2552
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 
 

3 files changed, 61 insertions, 0 deletions

diff --git a/src/qml/common/common.pri b/src/qml/common/common.pri
index 853ec4fd88..de95772120 100644
--- a/src/qml/common/common.pri
+++ b/src/qml/common/common.pri
@@ -1,2 +1,3 @@
 HEADERS += \
+    $$PWD/qqmlapiversion_p.h \
     $$PWD/qqmljsdiagnosticmessage_p.h
diff --git a/src/qml/common/qqmlapiversion_p.h b/src/qml/common/qqmlapiversion_p.h
new file mode 100644
index 0000000000..eca05558d8
--- /dev/null
+++ b/src/qml/common/qqmlapiversion_p.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLAPIVERSION_P_H
+#define QQMLAPIVERSION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#define Q_QML_PRIVATE_API_VERSION 5
+
+#endif // QQMLAPIVERSION_P_H
diff --git a/src/qml/common/qqmljsdiagnosticmessage_p.h b/src/qml/common/qqmljsdiagnosticmessage_p.h
index f747578c09..763332ba76 100644
--- a/src/qml/common/qqmljsdiagnosticmessage_p.h
+++ b/src/qml/common/qqmljsdiagnosticmessage_p.h
@@ -54,6 +54,10 @@
 #include <QtCore/qlogging.h>
 #include <QtCore/qstring.h>
 
+// Include the API version here, to avoid complications when querying it for the
+// QQmlSourceLocation -> line/column change.
+#include <private/qqmlapiversion_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace QQmlJS {