diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index d940341e202..2c7725260d2 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -656,17 +656,25 @@ def qdump__QFile(d, value): # 9fc0965 and a373ffcd change the layout of the private structure qtVersion = d.qtVersion() is32bit = d.ptrSize() == 4 - if qtVersion >= 0x060000: - # FIXME: values 0 are wrong. As the file name is the - # only direct member of QFilePrivate, the offsets are - # equal to sizeof(QFileDevicePrivate), the base class. + # FIXME: values 0 are wrong. As the file name is the + # only direct member of QFilePrivate, the offsets are + # equal to sizeof(QFileDevicePrivate), the base class. + if qtVersion >= 0x060300 and d.qtTypeInfoVersion() >= 22: + if d.isWindowsTarget(): + if d.isMsvcTarget(): + offset = 0 if is32bit else 424 + else: + offset = 0 if is32bit else 424 + else: + offset = 300 if is32bit else 424 + elif qtVersion >= 0x060000 and d.qtTypeInfoVersion() >= 20: if d.isWindowsTarget(): if d.isMsvcTarget(): offset = 0 if is32bit else 304 else: offset = 0 if is32bit else 304 else: - offset = 0 if is32bit else 304 + offset = 196 if is32bit else 304 elif qtVersion >= 0x050600 and d.qtTypeInfoVersion() >= 17: # Some QRingBuffer member got removed in 8f92baf5c9 if d.isWindowsTarget(): diff --git a/src/libs/utils/fadingindicator.cpp b/src/libs/utils/fadingindicator.cpp index 31ebbb79163..0d6f4ff89ee 100644 --- a/src/libs/utils/fadingindicator.cpp +++ b/src/libs/utils/fadingindicator.cpp @@ -47,13 +47,14 @@ public: FadingIndicatorPrivate(QWidget *parent, FadingIndicator::TextSize size) : QWidget(parent) { + setAttribute(Qt::WA_TransparentForMouseEvents, true); m_effect = new QGraphicsOpacityEffect(this); setGraphicsEffect(m_effect); m_effect->setOpacity(.999); m_label = new QLabel; QFont font = m_label->font(); - font.setPixelSize(size == FadingIndicator::LargeText ? 45 : 22); + font.setPixelSize(size == FadingIndicator::LargeText ? 30 : 18); m_label->setFont(font); QPalette pal = palette(); pal.setColor(QPalette::WindowText, pal.color(QPalette::Window)); @@ -67,6 +68,7 @@ public: { m_pixmap = QPixmap(); m_label->setText(text); + m_effect->setOpacity(.6); // because of the fat opaque background color layout()->setSizeConstraint(QLayout::SetFixedSize); adjustSize(); QWidget *parent = parentWidget(); diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp index 1d30d1afec0..8ec443337b6 100644 --- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp @@ -402,6 +402,8 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD this, &ClangdSettingsWidget::settingsDataChanged); connect(&d->sizeThresholdSpinBox, qOverload(&QSpinBox::valueChanged), this, &ClangdSettingsWidget::settingsDataChanged); + connect(&d->documentUpdateThreshold, qOverload(&QSpinBox::valueChanged), + this, &ClangdSettingsWidget::settingsDataChanged); connect(&d->clangdChooser, &Utils::PathChooser::pathChanged, this, &ClangdSettingsWidget::settingsDataChanged); } diff --git a/src/plugins/languageclient/languageclientfunctionhint.cpp b/src/plugins/languageclient/languageclientfunctionhint.cpp index 1e7c6dc551f..aa7a62af4dc 100644 --- a/src/plugins/languageclient/languageclientfunctionhint.cpp +++ b/src/plugins/languageclient/languageclientfunctionhint.cpp @@ -95,6 +95,7 @@ IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface auto uri = DocumentUri::fromFilePath(interface->filePath()); SignatureHelpRequest request((TextDocumentPositionParams(TextDocumentIdentifier(uri), Position(cursor)))); request.setResponseCallback([this](auto response) { this->handleSignatureResponse(response); }); + m_client->addAssistProcessor(this); m_client->sendContent(request); m_currentRequest = request.id(); return nullptr; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 8dbe236ca0a..2b490f5f96f 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -1907,6 +1907,9 @@ void NodeInstanceView::updateWatcher(const QString &path) const QString projPath = QFileInfo(model()->fileUrl().toLocalFile()).absolutePath(); #endif + if (projPath.isEmpty()) + return; + const QStringList files = m_fileSystemWatcher->files(); const QStringList directories = m_fileSystemWatcher->directories(); if (path.isEmpty()) { @@ -2025,6 +2028,8 @@ void NodeInstanceView::updateQsbPathToFilterMap() m_qsbPathToFilterMap.clear(); if (m_currentTarget && !m_qsbPath.isEmpty()) { const auto bs = qobject_cast(m_currentTarget->buildSystem()); + if (!bs) + return; const QStringList shaderToolFiles = bs->shaderToolFiles(); #ifndef QMLDESIGNER_TEST @@ -2032,6 +2037,9 @@ void NodeInstanceView::updateQsbPathToFilterMap() #else const QString projPath = QFileInfo(model()->fileUrl().toLocalFile()).absolutePath(); #endif + if (projPath.isEmpty()) + return; + // Parse ShaderTool files from project configuration. // Separate files to path and file name (called filter here as it can contain wildcards) // and group filters by paths. Blank path indicates project-wide file wildcard. @@ -2056,6 +2064,9 @@ void NodeInstanceView::handleShaderChanges() return; const auto bs = qobject_cast(m_currentTarget->buildSystem()); + if (!bs) + return; + QStringList baseArgs = bs->shaderToolArgs(); if (baseArgs.isEmpty()) return; diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp index 55e147eeeed..2f0ab2500b9 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp @@ -210,10 +210,15 @@ TypeName QmlTimelineKeyframeGroup::valueType() const const ModelNode targetNode = target(); - if (targetNode.isValid() && targetNode.hasMetaInfo()) - return targetNode.metaInfo().propertyTypeName(propertyName()); + TypeName typeName; - return TypeName(); + if (targetNode.isValid() && targetNode.hasMetaInfo()) + typeName = targetNode.metaInfo().propertyTypeName(propertyName()); + + if (typeName.startsWith(".")) + typeName.remove(0, 6); + + return typeName; } bool QmlTimelineKeyframeGroup::hasKeyframe(qreal frame) diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index 2fbc09f248c..e3fd4470da0 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -50,7 +50,7 @@ const char WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR[] = "WarnAboutQtQuickDesigner const char SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView"; const char ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView"; const char ALWAYS_SAVE_IN_CRUMBLEBAR[] = "AlwaysSaveInCrumbleBar"; -const char USE_DEFAULT_PUPPET[] = "UseDefaultPuppet"; +const char USE_DEFAULT_PUPPET[] = "UseDefaultQml2Puppet"; const char PUPPET_TOPLEVEL_BUILD_DIRECTORY[] = "PuppetToplevelBuildDirectory"; const char PUPPET_DEFAULT_DIRECTORY[] = "PuppetDefaultDirectory"; const char CONTROLS_STYLE[] = "ControlsStyle"; diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index ee1d1041a59..8a2bc21ea15 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -653,7 +653,6 @@ void QmlDesignerPlugin::emitUsageStatistics(const QString &identifier) { QTC_ASSERT(instance(), return); emit instance()->usageStatisticsNotifier(normalizeIdentifier(identifier)); - qDebug() << normalizeIdentifier(identifier); } void QmlDesignerPlugin::emitUsageStatisticsContextAction(const QString &identifier) @@ -680,7 +679,6 @@ void QmlDesignerPlugin::emitUsageStatisticsTime(const QString &identifier, int e { QTC_ASSERT(instance(), return); emit instance()->usageStatisticsUsageTimer(normalizeIdentifier(identifier), elapsed); - qDebug() << normalizeIdentifier(identifier); } QmlDesignerPlugin *QmlDesignerPlugin::instance() diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index b058600d0b2..b371c8b2f64 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -197,6 +197,7 @@ class StateListener : public QObject public: explicit StateListener(QObject *parent); + ~StateListener(); static QString windowTitleVcsTopic(const QString &filePath); @@ -221,10 +222,14 @@ StateListener::StateListener(QObject *parent) : QObject(parent) connect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, &StateListener::slotStateChanged); - EditorManager::setWindowTitleVcsTopicHandler(&StateListener::windowTitleVcsTopic); } +StateListener::~StateListener() +{ + EditorManager::setWindowTitleVcsTopicHandler({}); +} + QString StateListener::windowTitleVcsTopic(const QString &filePath) { FilePath searchPath; diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 36beacd8e6d..8490e90b2a7 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -157,7 +157,17 @@ void tst_offsets::offsets_data() const int qtVersion = QT_VERSION; const quintptr qtTypeVersion = qtHookData[6]; - if (qtTypeVersion >= 20) + if (qtTypeVersion >= 22) +#ifdef Q_OS_WIN +# ifdef Q_CC_MSVC + OFFSET_TEST(QFilePrivate, fileName) << 0 << 424; +# else // MinGW + OFFSET_TEST(QFilePrivate, fileName) << 0 << 424; +# endif +#else + OFFSET_TEST(QFilePrivate, fileName) << 300 << 424; +#endif + else if (qtTypeVersion >= 20) #ifdef Q_OS_WIN # ifdef Q_CC_MSVC OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; @@ -165,7 +175,7 @@ void tst_offsets::offsets_data() OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; # endif #else - OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; + OFFSET_TEST(QFilePrivate, fileName) << 196 << 304; #endif else if (qtVersion > 0x50600 && qtTypeVersion >= 17) #ifdef Q_OS_WIN diff --git a/tests/system/README b/tests/system/README index 2d71245cb34..890dc3caa6c 100644 --- a/tests/system/README +++ b/tests/system/README @@ -77,7 +77,7 @@ Attention! If any of these prerequisites cannot be satisfied the tests will like Prerequisites - debugging and analyzing ----------------------------------------- -In tst_simple_debug from suite_debbugger, Creator needs to read data from an application it +In tst_simple_debug from suite_debugger, Creator needs to read data from an application it started. On Windows, this has the following prerequisites: Either: * have no firewall at all enabled (sure that's a bad idea)