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

Change-Id: I311d1128c6a299c1db8717a12b40393055a889bb

cmake/FindQt5.cmake

@@ -57,7 +57,8 @@ else()
   find_package(Qt6 CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS})
 endif()
 
-foreach(comp IN LISTS Qt5_FIND_COMPONENTS)
+set(__additional_imported_components ATSPI2_nolink) # Work around QTBUG-97023
+foreach(comp IN LISTS Qt5_FIND_COMPONENTS __additional_imported_components)
   if(TARGET Qt6::${comp})
     if (NOT TARGET Qt5::${comp})
       set_property(TARGET Qt6::${comp} PROPERTY IMPORTED_GLOBAL TRUE)

coin/instructions/common_environment.yaml

@@ -7,7 +7,7 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
-        variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.2/6.2.0-rc-released/"
+        variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.2/6.2.0-final-released/"
       - type: EnvironmentVariable
         variableName: QTC_QT_MODULES
         variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations"

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml

@@ -1075,6 +1075,20 @@ SecondColumnLayout {
                             Layout.fillWidth: true
                             spacing: 0
 
+                            Connections {
+                                target: ceMode
+                                function onActivated() {
+                                    spinBox.readValue()
+                                }
+                            }
+
+                            Connections {
+                                target: modelNodeBackend
+                                function onSelectionChanged() {
+                                    spinBox.readValue()
+                                }
+                            }
+
                             GradientPropertySpinBox {
                                 id: spinBox
                                 implicitWidth: StudioTheme.Values.controlGap

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml

@@ -45,6 +45,10 @@ Item {
 
     onFocusChanged: restoreCursor()
 
+    function readValue() {
+        spinBox.realValue = gradientLine.model.readGradientProperty(wrapper.propertyName)
+    }
+
     StudioControls.RealSpinBox {
         id: spinBox
 
@@ -56,9 +60,7 @@ Item {
         realStepSize: 1
         decimals: 0
 
-        Component.onCompleted: {
+        Component.onCompleted: wrapper.readValue()
-            spinBox.realValue = gradientLine.model.readGradientProperty(wrapper.propertyName)
-        }
         onCompressedRealValueModified: {
             gradientLine.model.setGradientProperty(wrapper.propertyName, spinBox.realValue)
         }

src/app/main.cpp

@@ -494,6 +494,11 @@ int main(int argc, char **argv)
         QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
     }
 
+    if (Utils::HostOsInfo::isRunningUnderRosetta()) {
+        // work around QTBUG-97085: QRegularExpression jitting is not reentrant under Rosetta
+        qputenv("QT_ENABLE_REGEXP_JIT", "0");
+    }
+
     Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/" + Core::Constants::IDE_CASED_ID + "-XXXXXX");
 
 #ifdef Q_OS_MACOS

src/libs/qmljs/qmljscheck.cpp

@@ -1747,7 +1747,7 @@ bool Check::visit(CallExpression *ast)
     static const QStringList colorFunctions = {"lighter", "darker", "rgba",  "tint", "hsla", "hsva"};
 
     static const QStringList qtFunction = {"point", "rect", "size", "vector2d", "vector3d", "vector4d", "quaternion" "matrix4x4", "formatDate",
-                                           "formatDateTime", "formatTime"};
+                                           "formatDateTime", "formatTime", "resolvedUrl"};
 
     const bool whiteListedFunction =  translationFunctions.contains(name) || whiteListedFunctions.contains(name) || colorFunctions.contains(name) || qtFunction.contains(name);
 

src/plugins/qmldesigner/designercore/model/rewriterview.cpp

@@ -448,7 +448,7 @@ void RewriterView::auxiliaryDataChanged(const ModelNode &node, const PropertyNam
         return;
 
     if (node.isRootNode()) {
-        if (name == "width" || name == "height" || name == "autoSize")
+        if (name == "width" || name == "height" || name == "autoSize" || name == "formeditorColor")
             return;
     }