From b64863806fdde895399be961c79d6633fbd52723 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 21 Sep 2021 14:31:00 +0200 Subject: [PATCH 1/5] Tests: Fix expectations in offset test Change-Id: I875966409d769fe19e615763c605c527398b01dd Reviewed-by: hjk --- tests/auto/debugger/tst_offsets.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 2309b5296ae..88b8f08dc9b 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 (qtVersion > 0x50600 && qtTypeVersion >= 17) + if (qtTypeVersion >= 20) +#ifdef Q_OS_WIN +# ifdef Q_CC_MSVC + OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; +# else // MinGW + OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; +# endif +#else + OFFSET_TEST(QFilePrivate, fileName) << 0 << 304; +#endif + else if (qtVersion > 0x50600 && qtTypeVersion >= 17) #ifdef Q_OS_WIN # ifdef Q_CC_MSVC OFFSET_TEST(QFilePrivate, fileName) << 164 << 224; @@ -229,13 +239,16 @@ void tst_offsets::offsets_data() OFFSET_TEST(QFileSystemEntry, m_filePath) << 0 << 0; OFFSET_TEST(QFileInfoPrivate, fileEntry) << 4 << 8; - QTest::newRow("sizeof(QObjectData)") << int(sizeof(QObjectData)) - << 28 << 48; // vptr + 3 ptr + 2 int + ptr + // Qt5: vptr + 3 ptr + 2 int + ptr + // Qt6: vptr + objectlist + 8 unit:1 + uint:24 + int + ptr + bindingstorage + ptr + int size32 = qtVersion >= 0x60000 ? 60 : 28; + int size64 = qtVersion >= 0x60000 ? 80 : 48; + QTest::newRow("sizeof(QObjectData)") << int(sizeof(QObjectData)) << size32 << size64; - if (qtVersion >= 0x50000) - OFFSET_TEST(QObjectPrivate, extraData) << 28 << 48; // sizeof(QObjectData) + if (qtVersion >= 0x50000 && qtTypeVersion < 21) + OFFSET_TEST(QObjectPrivate, extraData) << size32 << size64; // sizeof(QObjectData) else - OFFSET_TEST(QObjectPrivate, extraData) << 32 << 56; // sizeof(QObjectData) + 1 ptr + OFFSET_TEST(QObjectPrivate, extraData) << size32 + 4 << size64 + 8; // sizeof(QObjectData) + 1 ptr #if QT_VERSION < 0x50000 OFFSET_TEST(QObjectPrivate, objectName) << 28 << 48; // sizeof(QObjectData) From 9b16a14ee44db72bc6b14ca89a09d3589c0f4b3c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 27 Sep 2021 14:04:39 +0200 Subject: [PATCH 2/5] Add change log for 5.0.2 Change-Id: I95ae1e171ff764baf4164a1afcae3cc272211b3e Reviewed-by: Leena Miettinen --- dist/changes-5.0.2.md | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 dist/changes-5.0.2.md diff --git a/dist/changes-5.0.2.md b/dist/changes-5.0.2.md new file mode 100644 index 00000000000..f01fc5e2d8d --- /dev/null +++ b/dist/changes-5.0.2.md @@ -0,0 +1,70 @@ +Qt Creator 5.0.2 +================ + +Qt Creator version 5.0.2 contains bug fixes. + +The most important changes are listed in this document. For a complete list of +changes, see the Git log for the Qt Creator sources that you can check out from +the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v5.0.1..v5.0.2 + +Help +---- + +* Fixed that Qt 5 context help was shown even if Qt 6 documentation is available + (QTCREATORBUG-26292) + +Projects +-------- + +* Fixed canceling of builds (QTCREATORBUG-26271) + +### CMake + +* Changed the `File System` special node to be shown only on parsing failure + (QTCREATORBUG-25994, QTCREATORBUG-25974) +* Fixed loading of projects without targets (QTCREATORBUG-25509) +* Fixed that no targets where shown in added build step (QTCREATORBUG-25759) +* Fixed that `ninja` could not be found after changing Qt installation location + (QTCREATORBUG-26289) + +Debugging +--------- + +### GDB + +* Fixed debugging of terminal applications with GDB < 10 (QTCREATORBUG-26299) + +Platforms +--------- + +### macOS + +* Fixed issue with absolute RPATH in `clazy-standalone` (QTCREATORBUG-26196) + +### Android + +* Fixed that wrong deployment file could be used (QTCREATORBUG-25793) + +Credits for these changes go to: +-------------------------------- +Alessandro Portale +Assam Boudjelthia +Christian Kandeler +Christian Stenger +Cristian Adam +Eike Ziller +Henning Gruendl +Ivan Komissarov +Jaroslaw Kobus +Johanna Vanhatapio +Kai Köhne +Knud Dollereder +Leena Miettinen +Mahmoud Badri +Marco Bubke +Orgad Shaneh +Robert Löhning +Thomas Hartmann From a6702d5a2df7836c48c222eff120a25a16059d3f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 24 Sep 2021 23:15:17 +0200 Subject: [PATCH 3/5] ProjectExplorer: Fix widths distributions in project welcome page The widths of the "Sessions" and "Projects" lists are not well distributed on Full HD screen width. The sessions are squeezed and the projects are extra wide. Set a stretch factor also on the Settings widget, so that both stretch proportionally. Use a 1 to 3 ratio. This change also removes the setting of struts which does not appear to have any effect and was (by mistake?) assigned to one sublayout, twice. Fixes: QTCREATORBUG-26319 Change-Id: I365a6a6c5d9c2250e3f711cc139d3279f2f5e3b1 Reviewed-by: Eike Ziller Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/projectwelcomepage.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 9858cb48f39..090cac1d877 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -614,14 +614,12 @@ public: auto vbox1 = new QVBoxLayout; vbox1->setContentsMargins(0, 0, 0, 0); - vbox1->addStrut(200); vbox1->addItem(hbox11); vbox1->addSpacing(16); vbox1->addWidget(sessionsList); auto vbox2 = new QVBoxLayout; vbox2->setContentsMargins(0, 0, 0, 0); - vbox1->addStrut(200); vbox2->addItem(hbox21); vbox2->addSpacing(16); vbox2->addWidget(projectsList); @@ -629,9 +627,10 @@ public: auto hbox = new QHBoxLayout(this); hbox->setContentsMargins(30, 27, 0, 27); hbox->addItem(vbox1); + hbox->setStretchFactor(vbox1, 1); hbox->addSpacing(16); hbox->addItem(vbox2); - hbox->setStretchFactor(vbox2, 2); + hbox->setStretchFactor(vbox2, 3); } SessionDelegate m_sessionDelegate; From 430c48ac1a934a0e7c3df584b3d5fdc75dad25d9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 28 Sep 2021 15:02:25 +0200 Subject: [PATCH 4/5] Tests: Fixup test expectations Amends b64863806fdde. Change-Id: I8df23cc10d71760cacb03eb59b728400a4ef3c61 Reviewed-by: hjk --- tests/auto/debugger/tst_offsets.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 88b8f08dc9b..36beacd8e6d 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -240,12 +240,16 @@ void tst_offsets::offsets_data() OFFSET_TEST(QFileInfoPrivate, fileEntry) << 4 << 8; // Qt5: vptr + 3 ptr + 2 int + ptr - // Qt6: vptr + objectlist + 8 unit:1 + uint:24 + int + ptr + bindingstorage + ptr - int size32 = qtVersion >= 0x60000 ? 60 : 28; - int size64 = qtVersion >= 0x60000 ? 80 : 48; + // Qt6: vptr + objectlist + 8 unit:1 + uint:24 + int + ptr + bindingstorage (+ ptr) + int size32 = qtVersion >= 0x60000 ? 56 : 28; + int size64 = qtVersion >= 0x60000 ? 72 : 48; + if (qtTypeVersion >= 21) { // the additional ptr was introduced with qtTypeVersion 21 + size32 += 4; + size64 += 8; + } QTest::newRow("sizeof(QObjectData)") << int(sizeof(QObjectData)) << size32 << size64; - if (qtVersion >= 0x50000 && qtTypeVersion < 21) + if (qtVersion >= 0x50000) OFFSET_TEST(QObjectPrivate, extraData) << size32 << size64; // sizeof(QObjectData) else OFFSET_TEST(QObjectPrivate, extraData) << size32 + 4 << size64 + 8; // sizeof(QObjectData) + 1 ptr From 99817d387030ea52c47b0ba70c1da8a414675dee Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 28 Sep 2021 18:16:07 +0300 Subject: [PATCH 5/5] Update Qbs submodule to the top of 1.20 branch Change-Id: I39d2bd127b0dc75d24614fd1a30b50be71a8d4ab Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 27bd9ac836b..4592eff2898 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 27bd9ac836b5cd2937b8d19dfa32cb4ff617b73c +Subproject commit 4592eff289852e3e5a81596d1cc6b0c2488e6bc0