Support for Qt 6.4+

.github/workflows/linux.yml

@@ -1,6 +1,20 @@
 name: Linux
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+  pull_request:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
 
 jobs:
   release:

.github/workflows/macos.yml

@@ -1,6 +1,20 @@
 name: macOS
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+  pull_request:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
 
 jobs:
   release:

.github/workflows/ubuntu.yml

@@ -1,17 +1,37 @@
 name: Ubuntu
 
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+  pull_request:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
 
 jobs:
-  jammy:
-    runs-on: ubuntu-22.04
+  qt5_15_arm:
+    runs-on: ubuntu-24.04-arm
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
-      run: APT=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
-  noble:
+      run: APT=1 CI=1 CPU=aarch64 MKJOBS=2 ./src/scripts/ci.sh
+  qt6_4:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Build
+      run: APT=1 QT6="ON" FFMPEG=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
+  qt6_10:
+    runs-on: ubuntu-26.04
+    steps:
+    - uses: actions/checkout@v4
     - name: Build
-      run: APT=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
+      run: APT=1 QT6="ON" FFMPEG=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh

.github/workflows/windows.yml

@@ -1,12 +1,26 @@
 name: Windows
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+  pull_request:
+    branches:
+      - main
+      - v1.0
+      - v1.1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
 
 jobs:
   release:
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       shell: cmd
       run: .\src\scripts\build.bat ci

src/app/GUI/BoxesList/boolpropertywidget.cpp

@@ -89,7 +89,7 @@ void BoolPropertyWidget::paintEvent(QPaintEvent *) {
     p.end();
 }
 
-void BoolPropertyWidget::enterEvent(QEvent *) {
+void BoolPropertyWidget::enterEvent(QtEnterEvent *) {
     mHovered = true;
     update();
 }

src/app/GUI/BoxesList/boolpropertywidget.h

@@ -29,6 +29,7 @@
 #include <QWidget>
 #include "Properties/boolproperty.h"
 #include "Properties/boolpropertycontainer.h"
+#include "../ui/enterevent.h"
 
 class BoolPropertyWidget : public QWidget {
     Q_OBJECT
@@ -40,7 +41,7 @@ class BoolPropertyWidget : public QWidget {
 protected:
     void mousePressEvent(QMouseEvent *);
     void paintEvent(QPaintEvent *);
-    void enterEvent(QEvent *);
+    void enterEvent(QtEnterEvent *);
     void leaveEvent(QEvent *);
 private:
     bool mHovered = false;

src/app/GUI/BoxesList/boxscroller.cpp

@@ -180,17 +180,18 @@ void BoxScroller::stopScrolling() {
     }
 }
 
-void BoxScroller::dropEvent(QDropEvent *event) {
+void BoxScroller::dropEvent(QDropEvent *event)
+{
     stopScrolling();
     mCurrentMimeData = event->mimeData();
-    mLastDragMoveY = event->pos().y();
+    mLastDragMoveY = AppSupport::getDropPos(event).y();
     updateDropTarget();
-    if(mDropTarget.isValid()) {
+    if (mDropTarget.isValid()) {
         const auto targetAbs = mDropTarget.fTargetParent;
         const auto target = targetAbs->getTarget();
-        if(mDropTarget.fDropType == DropType::on) {
+        if (mDropTarget.fDropType == DropType::on) {
             target->SWT_drop(mCurrentMimeData);
-        } else if(mDropTarget.fDropType == DropType::into) {
+        } else if (mDropTarget.fDropType == DropType::into) {
             target->SWT_dropInto(mDropTarget.fTargetId, mCurrentMimeData);
         }
         planScheduleUpdateVisibleWidgetsContent();
@@ -200,13 +201,14 @@ void BoxScroller::dropEvent(QDropEvent *event) {
     mDropTarget.reset();
 }
 
-void BoxScroller::dragEnterEvent(QDragEnterEvent *event) {
+void BoxScroller::dragEnterEvent(QDragEnterEvent *event)
+{
     const auto mimeData = event->mimeData();
-    mLastDragMoveY = event->pos().y();
+    mLastDragMoveY = AppSupport::getDropPos(event).y();
     mCurrentMimeData = mimeData;
     updateDropTarget();
     //mDragging = true;
-    if(mCurrentMimeData) event->acceptProposedAction();
+    if (mCurrentMimeData) { event->acceptProposedAction(); }
     update();
 }
 
@@ -218,18 +220,19 @@ void BoxScroller::dragLeaveEvent(QDragLeaveEvent *event) {
     update();
 }
 
-void BoxScroller::dragMoveEvent(QDragMoveEvent *event) {
+void BoxScroller::dragMoveEvent(QDragMoveEvent *event)
+{
     event->acceptProposedAction();
-    const int yPos = event->pos().y();
+    const int yPos = AppSupport::getDropPos(event).y();
 
-    if(yPos < 30) {
-        if(!mScrollTimer->isActive()) {
+    if (yPos < 30) {
+        if (!mScrollTimer->isActive()) {
             connect(mScrollTimer, &QTimer::timeout,
                     this, &BoxScroller::scrollUp);
             mScrollTimer->start(300);
         }
-    } else if(yPos > height() - 30) {
-        if(!mScrollTimer->isActive()) {
+    } else if (yPos > height() - 30) {
+        if (!mScrollTimer->isActive()) {
             connect(mScrollTimer, &QTimer::timeout,
                     this, &BoxScroller::scrollDown);
             mScrollTimer->start(300);

src/app/GUI/BoxesList/boxsinglewidget.cpp

@@ -654,8 +654,10 @@ void BoxSingleWidget::clearStaticPixmaps()
 
 void BoxSingleWidget::mousePressEvent(QMouseEvent *event) {
     if(!mTarget) return;
-    if(event->x() < mFillWidget->x() ||
-       event->x() > mFillWidget->x() + mFillWidget->width()) return;
+    const auto mouseX = AppSupport::getMouseX(event);
+    if (mouseX < mFillWidget->x() ||
+        mouseX > mFillWidget->x() + mFillWidget->width()) return;
+
     const auto target = mTarget->getTarget();
     if(event->button() == Qt::RightButton) {
         setSelected(true);
@@ -672,7 +674,7 @@ void BoxSingleWidget::mousePressEvent(QMouseEvent *event) {
             PropertyMenu pMenu(&menu, mParent->currentScene(), MainWindow::sGetInstance());
             pTarget->prp_setupTreeViewMenu(&pMenu);
         }
-        menu.exec(event->globalPos());
+        menu.exec(AppSupport::getMouseGlobalPos(event));
         setSelected(false);
     } else {
         mDragPressPos = event->pos().x() > mFillWidget->x();
@@ -691,7 +693,8 @@ void BoxSingleWidget::mouseMoveEvent(QMouseEvent *event) {
     {
         const auto prop = static_cast<Property*>(mTarget->getTarget());
         const QString name = prop->prp_getName();
-        const int nameWidth = QApplication::fontMetrics().horizontalAdvance(name);
+        QFontMetricsF fmf(QApplication::font());
+        const int nameWidth = static_cast<int>(fmf.horizontalAdvance(name));
         QPixmap pixmap(mFillWidget->x() + nameWidth + eSizesUI::widget, height());
         render(&pixmap);
         drag->setPixmap(pixmap);
@@ -713,13 +716,14 @@ void BoxSingleWidget::mouseReleaseEvent(QMouseEvent *event)
     const auto target = mTarget->getTarget();
 
     const auto bbox = enve_cast<BoundingBox*>(target);
-    if (event->button() == Qt::MidButton && bbox) {
+    if (event->button() == Qt::MiddleButton && bbox) {
         PropertyNameDialog::sRenameBox(bbox, this);
         return;
     }
 
-    if (event->x() < mFillWidget->x() ||
-        event->x() > mFillWidget->x() + mFillWidget->width()) { return; }
+    const auto mouseX = AppSupport::getMouseX(event);
+    if (mouseX < mFillWidget->x() ||
+        mouseX > mFillWidget->x() + mFillWidget->width()) { return; }
     setSelected(false);
 
     if (pointToLen(event->pos() - mDragStartPos) > eSizesUI::widget/2) { return; }
@@ -734,7 +738,7 @@ void BoxSingleWidget::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
-void BoxSingleWidget::enterEvent(QEvent *)
+void BoxSingleWidget::enterEvent(QtEnterEvent *)
 {
 #ifdef Q_OS_MAC
     setFocus();

src/app/GUI/BoxesList/boxsinglewidget.h

@@ -37,6 +37,8 @@
 #include "smartPointers/ememory.h"
 #include "framerange.h"
 #include "Animators/SmartPath/smartpathanimator.h"
+#include "../ui/enterevent.h"
+
 class QrealAnimatorValueSlider;
 class TimelineMovable;
 class Key;
@@ -101,7 +103,7 @@ class BoxSingleWidget : public SingleWidget {
     void mouseMoveEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
 
-    void enterEvent(QEvent *);
+    void enterEvent(QtEnterEvent *);
     void leaveEvent(QEvent *);
 
 #ifdef Q_OS_MAC

src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp

@@ -60,8 +60,8 @@ class ShaderChoiceDialog : public QDialog {
         const auto textTriggerGetter = [this, &options, &homePath](const int id) {
             const auto& shader = options.at(id);
             QString ttPath = shader->fGrePath;
-            if(ttPath.left(homePath.count()) == homePath) {
-                ttPath = "~" + ttPath.mid(homePath.count());
+            if(ttPath.left(homePath.size()) == homePath) {
+                ttPath = "~" + ttPath.mid(homePath.size());
             }
             return ButtonsList::TextTrigger{
                 ttPath, [this, ttPath, id, &options]() {

src/app/GUI/Expressions/expressiondialog.cpp

@@ -554,35 +554,42 @@ void ExpressionDialog::updateScriptDefinitions()
     }
 
     {
-        QRegExp funcDefs("(class|function)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(\\([a-zA-Z0-9_, ]*\\))");
-        int pos = 0;
-        while ((pos = funcDefs.indexIn(scriptContext, pos)) != -1) {
-              QStringList funcs = funcDefs.capturedTexts();
-              for (int i = 2; i < funcs.count() - 1; i += 3) {
-                  const auto& func = funcs.at(i);
-                  const auto& funcArgs = funcs.at(i + 1);
-                  if (func.isEmpty()) { continue; }
-                  mScriptApi->add(func + funcArgs);
-                  mScriptLexer->addDefinition(func);
-                  mDefsLexer->addDefinition(func);
-              }
-              pos += funcDefs.matchedLength();
+        QRegularExpression funcDefs("(class|function)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(\\([a-zA-Z0-9_, ]*\\))");
+        auto matchIterator = funcDefs.globalMatch(scriptContext);
+
+        while (matchIterator.hasNext()) {
+            QRegularExpressionMatch match = matchIterator.next();
+            QStringList funcs = match.capturedTexts();
+
+            for (int i = 2; i < funcs.count() - 1; i += 3) {
+                const auto& func = funcs.at(i);
+                const auto& funcArgs = funcs.at(i + 1);
+                if (func.isEmpty()) { continue; }
+
+                mScriptApi->add(func + funcArgs);
+                mScriptLexer->addDefinition(func);
+                mDefsLexer->addDefinition(func);
+            }
         }
     }
 
     {
-        QRegExp varDefs("([a-zA-Z_][a-zA-Z0-9_]*)\\s*=\\s*(?!=)");
-        int pos = 0;
-        while ((pos = varDefs.indexIn(scriptContext, pos)) != -1) {
-              QStringList vars = varDefs.capturedTexts();
-              for (int i = 1; i < vars.count(); i++) {
-                  const auto& var = vars.at(i);
-                  if (var.isEmpty()) { continue; }
-                  mScriptApi->add(var);
-                  mScriptLexer->addDefinition(var);
-                  mDefsLexer->addDefinition(var);
-              }
-              pos += varDefs.matchedLength();
+        QRegularExpression varDefs("([a-zA-Z_][a-zA-Z0-9_]*)\\s*=\\s*(?!=)");
+
+        auto matchIterator = varDefs.globalMatch(scriptContext);
+
+        while (matchIterator.hasNext()) {
+            QRegularExpressionMatch match = matchIterator.next();
+            QStringList vars = match.capturedTexts();
+
+            for (int i = 1; i < vars.count(); i++) {
+                const auto& var = vars.at(i);
+                if (var.isEmpty()) { continue; }
+
+                mScriptApi->add(var);
+                mScriptLexer->addDefinition(var);
+                mDefsLexer->addDefinition(var);
+            }
         }
     }
 }

src/app/GUI/Expressions/expressioneditor.cpp

@@ -87,7 +87,7 @@ void ExpressionEditor::keyPressEvent(QKeyEvent *e) {
     } else if(key == Qt::Key_Tab) {
         return QWidget::keyPressEvent(e);
     } else QTextEdit::keyPressEvent(e);
-    const bool input = e->text().contains(QRegExp("[A-Za-z0-9_ \\.\\$]"));
+    const bool input = e->text().contains(QRegularExpression("[A-Za-z0-9_ \\.\\$]"));
     const bool deletion = key == Qt::Key_Delete ||
             key == Qt::Key_Backspace;
     const bool arrows = key == Qt::Key_Right ||

src/app/GUI/Expressions/expressionhighlighter.cpp

@@ -142,10 +142,10 @@ void ExpressionHighlighter::highlightBlock(const QString &text) {
             int min = match.capturedStart(2);
             for(int j = 0; j < subPath.count() - 1; j++) {
                 const auto& jObj = subPath.at(j);
-                min += jObj.count() + 1;
+                min += jObj.size() + 1;
             }
             const auto& lastObjPath = subPath.last();
-            const int max = min + lastObjPath.count();
+            const int max = min + lastObjPath.size();
             const bool autocomplete = mCursorPos >= min && mCursorPos <= max;
             const auto obj = mSearchCtxt->ca_findPropertyWithPathRec(
                         0, subPath, autocomplete ? &completions : nullptr);