feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Designer: Update C++ code model on an object name change in designer

Browse Source 
We try to locate the old symbol name in the generated ui header and
rename the symbol in the background.

Task-number: QTCREATORBUG-1179
Change-Id: Iaf68e3922cd728cbc87d0dc97125e34b8bdaa6be
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2023-01-16 17:03:26 +01:00
parent b4b2600715
commit 0d909c353c
36 changed files with 470 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -13,10 +13,12 @@
#include <utils/asynctask.h>
#include <utils/expected.h>
#include <utils/guard.h>
#include <utils/qtcprocess.h>
#include <QDateTime>
#include <QFutureInterface>
#include <QLoggingCategory>
#include <QThreadPool>
#include <QTimer>
@@ -26,6 +28,7 @@ namespace ProjectExplorer {
Q_GLOBAL_STATIC(QThreadPool, s_extraCompilerThreadPool);
Q_GLOBAL_STATIC(QList<ExtraCompilerFactory *>, factories);
Q_LOGGING_CATEGORY(log, "qtc.projectexplorer.extracompiler", QtWarningMsg);
class ExtraCompilerPrivate
{
@@ -37,6 +40,7 @@ public:
Core::IEditor *lastEditor = nullptr;
QMetaObject::Connection activeBuildConfigConnection;
QMetaObject::Connection activeEnvironmentConnection;
Utils::Guard lock;
bool dirty = false;
QTimer timer;
@@ -55,13 +59,7 @@ ExtraCompiler::ExtraCompiler(const Project *project, const FilePath &source,
d->contents.insert(target, QByteArray());
d->timer.setSingleShot(true);
connect(&d->timer, &QTimer::timeout, this, [this] {
if (d->dirty && d->lastEditor) {
d->dirty = false;
compileContent(d->lastEditor->document()->contents());
}
});
connect(&d->timer, &QTimer::timeout, this, &ExtraCompiler::compileIfDirty);
connect(BuildManager::instance(), &BuildManager::buildStateChanged,
this, &ExtraCompiler::onTargetsBuilt);
@@ -163,6 +161,16 @@ void ExtraCompiler::compileImpl(const ContentProvider &provider)
d->m_taskTree->start();
}
void ExtraCompiler::compileIfDirty()
{
qCDebug(log) << Q_FUNC_INFO;
if (!d->lock.isLocked() && d->dirty && d->lastEditor) {
qCDebug(log) << '\t' << "about to compile";
d->dirty = false;
compileContent(d->lastEditor->document()->contents());
}
}
ExtraCompiler::ContentProvider ExtraCompiler::fromFileProvider() const
{
const auto provider = [fileName = source()] {
@@ -179,6 +187,20 @@ bool ExtraCompiler::isDirty() const
return d->dirty;
}
void ExtraCompiler::block()
{
qCDebug(log) << Q_FUNC_INFO;
d->lock.lock();
}
void ExtraCompiler::unblock()
{
qCDebug(log) << Q_FUNC_INFO;
d->lock.unlock();
if (!d->lock.isLocked() && !d->timer.isActive())
d->timer.start();
}
void ExtraCompiler::onTargetsBuilt(Project *project)
{
if (project != d->project || BuildManager::isBuilding(project))
@@ -278,6 +300,7 @@ Utils::FutureSynchronizer *ExtraCompiler::futureSynchronizer() const
void ExtraCompiler::setContent(const FilePath &file, const QByteArray &contents)
{
qCDebug(log).noquote() << Q_FUNC_INFO << contents;
auto it = d->contents.find(file);
if (it != d->contents.end()) {
if (it.value() != contents) {