From 0f87be729c6442c07ea3032ec0903e920a9c6ca6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 8 Oct 2020 12:50:06 +0200 Subject: [PATCH 1/2] Bump version to 4.13.3 Change-Id: Ia546dc945af578105ad959005e7e710f5d592573 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator_ide_branding.pri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 0dea6a2eb35..2a22fb0a35d 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,8 +1,8 @@ #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.13.2") # The IDE version. +set(IDE_VERSION "4.13.3") # The IDE version. set(IDE_VERSION_COMPAT "4.13.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.13.2") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.13.3") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index c44068dc28e..db1db601b0c 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.13.2' + property string qtcreator_display_version: '4.13.3' property string ide_version_major: '4' property string ide_version_minor: '13' - property string ide_version_release: '2' + property string ide_version_release: '3' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index bdb4f4e5299..c09bdeb9f6c 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.13.2 +QTCREATOR_VERSION = 4.13.3 QTCREATOR_COMPAT_VERSION = 4.13.0 -QTCREATOR_DISPLAY_VERSION = 4.13.2 +QTCREATOR_DISPLAY_VERSION = 4.13.3 QTCREATOR_COPYRIGHT_YEAR = 2020 IDE_DISPLAY_NAME = Qt Creator From db4b3641f5235be9a67967e0cf33512da2b50f6b Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 9 Oct 2020 12:29:57 +0200 Subject: [PATCH 2/2] qmlprofiler: Fix a crash in the rangeFilter Always check the stack before popping an element. Fixes: QTCREATORBUG-24730 Change-Id: I7dc6363137ef002219fbc49b7343cff8112a58c2 Reviewed-by: Ulf Hermann --- src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index f1349d97d9c..868b481a19d 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -395,7 +395,7 @@ QmlProfilerModelManager::rangeFilter(qint64 rangeStart, qint64 rangeEnd) const if (type.rangeType() != MaximumRangeType) { if (event.rangeStage() == RangeStart) stack.push(event); - else if (event.rangeStage() == RangeEnd) + else if (event.rangeStage() == RangeEnd && !stack.isEmpty()) stack.pop(); return true; } else if (isStateful(type)) {