diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-13 14:48:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-13 14:48:12 +0100 |
| commit | 2f6aaed6dc157121e95b5dd210aea8bbd1338722 (patch) | |
| tree | 4899d6e15980d1bfecb462ddf637b0445877a203 /src/qdoc/qmlcodeparser.h | |
| parent | 07c2c0604bbfac064c8303f2a68ac54f8b7a78fc (diff) | |
| parent | 995c91cd814d47e5ac3e20aca1d70d6e66f39cf2 (diff) | |
| download | qttools-2f6aaed6dc157121e95b5dd210aea8bbd1338722.tar.gz | |
Merge remote-tracking branch 'origin/wip/qdoc-clang' into dev
Conflicts:
src/qdoc/cppcodeparser.h
src/qdoc/location.cpp
src/qdoc/qmlcodeparser.h
Change-Id: I2e579ca5d83cd1c4b42acc9a07066d800cbc02cb
Diffstat (limited to 'src/qdoc/qmlcodeparser.h')
| -rw-r--r-- | src/qdoc/qmlcodeparser.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qdoc/qmlcodeparser.h b/src/qdoc/qmlcodeparser.h index 0a63a019d..3788175f3 100644 --- a/src/qdoc/qmlcodeparser.h +++ b/src/qdoc/qmlcodeparser.h @@ -61,7 +61,6 @@ public: QString language() override; QStringList sourceFileNameFilter() override; void parseSourceFile(const Location& location, const QString& filePath) override; - void doneParsingSourceFiles() override; #ifndef QT_NO_DECLARATIVE /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */ |