diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-05 16:20:05 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-10 11:09:33 +0200 |
commit | 3cc4de133f74554ddc50296385ac0ec7fd98c6d6 (patch) | |
tree | 5eb655bd3b6429365ab6c6e84d2d44a774a4b15e /sources/shiboken2/ApiExtractor/typedatabase.cpp | |
parent | ebab05a07e002655934cde5278084abcc1ccf37a (diff) | |
parent | c482d66c4403a1e8dd3ae0c6635b6a25ca9d5aaa (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typedatabase.cpp')
-rw-r--r-- | sources/shiboken2/ApiExtractor/typedatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.cpp b/sources/shiboken2/ApiExtractor/typedatabase.cpp index 144795c6a..4f8887bd2 100644 --- a/sources/shiboken2/ApiExtractor/typedatabase.cpp +++ b/sources/shiboken2/ApiExtractor/typedatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Python. @@ -28,7 +28,7 @@ #include "typedatabase.h" #include "typesystem.h" -#include "typesystem_p.h" +#include "typesystemparser.h" #include <QtCore/QFile> #include <QtCore/QDebug> @@ -572,7 +572,7 @@ bool TypeDatabase::parseFile(const QString &filename, const QString ¤tPath bool TypeDatabase::parseFile(QIODevice* device, bool generate) { QXmlStreamReader reader(device); - Handler handler(this, generate); + TypeSystemParser handler(this, generate); const bool result = handler.parse(reader); if (!result) qCWarning(lcShiboken, "%s", qPrintable(handler.errorString())); |