4 files changed, 11 insertions, 7 deletions

diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 9871b3478f6..9b2a73898c4 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "16.0.82") # The IDE version.
-set(IDE_VERSION_COMPAT "16.0.82") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "17.0.0-beta1") # The IDE display version.
+set(IDE_VERSION "17.0.82") # The IDE version.
+set(IDE_VERSION_COMPAT "17.0.82") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "18.0.0-beta1") # The IDE display version.

 set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
 set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name.
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index ae8dc21ff38..dec02b20a2a 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -4,14 +4,14 @@ import qbs.FileInfo
 import qbs.Utilities

 Module {
- property string qtcreator_display_version: '17.0.0-beta1'
- property string ide_version_major: '16'
+ property string qtcreator_display_version: '18.0.0-beta1'
+ property string ide_version_major: '17'
 property string ide_version_minor: '0'
 property string ide_version_release: '82'
 property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
 + ide_version_release

- property string ide_compat_version_major: '16'
+ property string ide_compat_version_major: '17'
 property string ide_compat_version_minor: '0'
 property string ide_compat_version_release: '82'
 property string qtcreator_compat_version: ide_compat_version_major + '.'
diff --git a/src/plugins/coco/cocobuildstep.cpp b/src/plugins/coco/cocobuildstep.cpp
index 1717abd027a..c9809932b7c 100644
--- a/src/plugins/coco/cocobuildstep.cpp
+++ b/src/plugins/coco/cocobuildstep.cpp
@@ -77,6 +77,8 @@ void CocoBuildStep::buildSystemUpdated()

 void CocoBuildStep::onButtonClicked()
 {
+ QTC_ASSERT(m_buildSettings, return);
+
 m_valid = !m_valid;

 setSummaryText(Tr::tr("Coco Code Coverage: Reconfiguring..."));
@@ -97,6 +99,8 @@ QWidget *CocoBuildStep::createConfigWidget()

 void CocoBuildStep::updateDisplay()
 {
+ QTC_ASSERT(m_buildSettings, return);
+
 if (!cocoSettings().isValid()) {
 setSummaryText("<i>" + Tr::tr("Coco Code Coverage: No working Coco installation.") + "</i>");
 emit setButtonState(false);
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 01597e8f7e4..fbfd9277e8c 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -4985,7 +4985,7 @@ bool TextEditorWidget::viewportEvent(QEvent *event)
 // Only handle tool tip for text cursor if mouse is within the block for the text cursor,
 // and not if the mouse is e.g. in the empty space behind a short line.
 if (line.isValid()) {
- const QRectF blockGeometry = blockBoundingGeometry(block);
+ const QRectF blockGeometry = blockBoundingGeometry(block).translated(contentOffset());
 const int width = block == d->m_suggestionBlock ? blockGeometry.width()
 : line.naturalTextRect().right();
 if (pos.x() <= blockGeometry.left() + width) {