forked from qt-creator/qt-creator
CompilationDbProjectManager: Sanitize project parsing
The parsing code used to access all kinds of stuff (e.g. the project tree and the toolchain manager) from the non-UI thread, which is not allowed. Fixes: QTCREATORBUG-22420 Change-Id: I4be47919d7e543376d31826dd380f66f4e060458 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
@@ -0,0 +1,78 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2019 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of Qt Creator.
|
||||
**
|
||||
** 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 General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** 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-3.0.html.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "compilationdatabaseutils.h"
|
||||
|
||||
#include <utils/fileutils.h>
|
||||
|
||||
#include <QFutureWatcher>
|
||||
#include <QList>
|
||||
#include <QObject>
|
||||
#include <QStringList>
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace ProjectExplorer {
|
||||
class FileNode;
|
||||
class TreeScanner;
|
||||
}
|
||||
|
||||
namespace CompilationDatabaseProjectManager {
|
||||
namespace Internal {
|
||||
|
||||
class CompilationDbParser : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit CompilationDbParser(const QString &projectName, const Utils::FileName &projectPath,
|
||||
const Utils::FileName &rootPath, MimeBinaryCache &mimeBinaryCache,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
void start();
|
||||
void stop();
|
||||
|
||||
QList<ProjectExplorer::FileNode *> scannedFiles() const;
|
||||
DbContents dbContents() const { return m_dbContents; }
|
||||
|
||||
signals:
|
||||
void finished(bool success);
|
||||
|
||||
private:
|
||||
void finish();
|
||||
DbContents parseProject();
|
||||
|
||||
const QString m_projectName;
|
||||
const Utils::FileName m_projectFilePath;
|
||||
const Utils::FileName m_rootPath;
|
||||
MimeBinaryCache &m_mimeBinaryCache;
|
||||
ProjectExplorer::TreeScanner *m_treeScanner = nullptr;
|
||||
QFutureWatcher<DbContents> m_parserWatcher;
|
||||
DbContents m_dbContents;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace CompilationDatabaseProjectManager
|
||||
Reference in New Issue
Block a user