Merge remote-tracking branch 'origin/5.0' into 6.0

Change-Id: Iaa5a0fea546d4f28dbceae0458a325077ed382b7

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  

src/plugins/projectexplorer/projectwelcomepage.cpp

@@ -613,14 +613,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);
@@ -628,9 +626,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;

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,20 @@ 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))
+    // Qt5: vptr + 3 ptr + 2 int + ptr
-        << 28 << 48; // vptr + 3 ptr + 2 int + ptr
+    // 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)
-        OFFSET_TEST(QObjectPrivate, extraData) << 28 << 48; // sizeof(QObjectData)
+        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)