fix: resolve Qt6 compatibility issues

18202781743 · 18202781743 · commit 32d0f1ee538f · 2025-07-28T16:05:40.000+08:00
1. Replace deprecated qAsConst with std::as_const for Qt6 compatibility
2. Update key sequence handling to use | operator instead of + for Qt6
3. Fix touch event handling for Qt6 API changes
4. Replace stateChanged with checkStateChanged for Qt6 checkbox signals
5. Add version checks for Qt6-specific API changes
6. Fix various other Qt6 deprecation warnings

These changes ensure the codebase works correctly with both Qt5 and
Qt6, addressing API changes and deprecations in Qt6 while maintaining
backward compatibility. Key technical changes include:
- Using Qt version checks for API differences
- Standardizing on newer APIs where possible
- Maintaining compatibility with both major Qt versions

fix: 解决Qt6兼容性问题

1. 使用std::as_const替代已弃用的qAsConst以兼容Qt6
2. 更新键序列处理，在Qt6中使用|运算符而非+
3. 修复Qt6中触摸事件处理的API变更
4. 将stateChanged替换为checkStateChanged以适配Qt6复选框信号
5. 添加Qt6特定API变更的版本检查
6. 修复其他Qt6弃用警告

这些修改确保代码库能正确工作在Qt5和Qt6环境下，解决了Qt6中的API变更和弃用
问题，同时保持向后兼容性。关键技术变更包括：
- 针对API差异使用Qt版本检查
- 尽可能标准化使用新API
- 保持对两个主要Qt版本的兼容性
diff --git a/examples/collections/editexample.cpp b/examples/collections/editexample.cpp
@@ -373,7 +373,11 @@ DKeySequenceEditExample::DKeySequenceEditExample(QWidget *parent)
     closeLabel1->setFixedSize(72, 19);
     closeLabel1->setAlignment(Qt::AlignLeft);
     DKeySequenceEdit *closeEdit1 = new DKeySequenceEdit(this);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    closeEdit1->setKeySequence(QKeySequence(Qt::ALT | Qt::Key_F4));
+#else
     closeEdit1->setKeySequence(QKeySequence(Qt::ALT + Qt::Key_F4));
+#endif
     QLabel *closeLabel2 = new QLabel("关闭窗口", this);
     closeLabel2->setFixedSize(72, 19);
     closeLabel2->setAlignment(Qt::AlignLeft);
diff --git a/examples/collections/mainwindow.cpp b/examples/collections/mainwindow.cpp
@@ -313,18 +313,11 @@ void MainWindow::menuItemInvoked(QAction *action)
                             _printer->newPage();
 
                         // 给出调用方widget界面作为打印内容
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-                        double xscale = _printer->pageRect().width() / double(this->width());
-                        double yscale = _printer->pageRect().height() / double(this->height());
-                        double scale = qMin(xscale, yscale);
-                        painter.translate(_printer->pageRect().width() / 2.0, _printer->pageRect().height() / 2.0);
-#else
                         double xscale = _printer->pageLayout().paintRectPixels(_printer->resolution()).width() / double(this->width());
                         double yscale = _printer->pageLayout().paintRectPixels(_printer->resolution()).height() / double(this->height());
                         double scale = qMin(xscale, yscale);
                         painter.translate(_printer->pageLayout().paintRectPixels(_printer->resolution()).width() / 2.0,
                                           _printer->pageLayout().paintRectPixels(_printer->resolution()).height() /2.0);
-#endif
                         painter.scale(scale, scale);
                         painter.translate(-this->width() / 2, -this->height() / 2);
                         this->render(&painter);
@@ -333,11 +326,7 @@ void MainWindow::menuItemInvoked(QAction *action)
                         QFont font /*("CESI仿宋-GB2312")*/;
                         font.setPixelSize(16);
                         font = QFont(font, painter.device());
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-                        QRectF rect = _printer->pageRect();
-#else
                         QRectF rect = _printer->pageLayout().paintRectPixels(_printer->resolution());
-#endif
                         rect = QRectF(0, 0, rect.width(), rect.height());
                         painter.setFont(font);
                         // 画可用页面矩形,提供调试效果参考
diff --git a/include/widgets/dinputdialog.h b/include/widgets/dinputdialog.h
@@ -106,20 +106,20 @@ class DInputDialog : public DDialog
 
     static QString getText(QWidget *parent, const QString &title, const QString &message,
                            QLineEdit::EchoMode echo = QLineEdit::Normal,
-                           const QString &text = QString(), bool *ok = 0, Qt::WindowFlags flags = Qt::WindowFlags{0},
+                           const QString &text = QString(), bool *ok = 0, Qt::WindowFlags flags = {},
                            Qt::InputMethodHints inputMethodHints = Qt::ImhNone);
 
     static QString getItem(QWidget *parent, const QString &title, const QString &message,
                            const QStringList &items, int current = 0, bool editable = true,
-                           bool *ok = 0, Qt::WindowFlags flags = Qt::WindowFlags{0},
+                           bool *ok = 0, Qt::WindowFlags flags = {},
                            Qt::InputMethodHints inputMethodHints = Qt::ImhNone);
 
     static int getInt(QWidget *parent, const QString &title, const QString &message, int value = 0,
                       int minValue = -2147483647, int maxValue = 2147483647,
-                      int step = 1, bool *ok = 0, Qt::WindowFlags flags = Qt::WindowFlags{0});
+                      int step = 1, bool *ok = 0, Qt::WindowFlags flags = {});
     static double getDouble(QWidget *parent, const QString &title, const QString &message, double value = 0,
                             double minValue = -2147483647, double maxValue = 2147483647,
-                            int decimals = 1, bool *ok = 0, Qt::WindowFlags flags = Qt::WindowFlags{0});
+                            int decimals = 1, bool *ok = 0, Qt::WindowFlags flags = {});
 
 protected:
     void showEvent(QShowEvent *e);
diff --git a/plugin/dtkuidemo/mainwindow.cpp b/plugin/dtkuidemo/mainwindow.cpp
@@ -128,7 +128,11 @@ MainWindow::MainWindow(QWidget *parent) :
     // 设置 key seq
     DKeySequenceEdit *keyEditer = ui->Dtk__Widget__DKeySequenceEdit;
     keyEditer->setAlignment(Qt::AlignCenter);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    keyEditer->setKeySequence(QKeySequence(Qt::CTRL | Qt::Key_A));      // 用|号，不要用+号
+#else
     keyEditer->setKeySequence(QKeySequence(Qt::CTRL + Qt::Key_A));      // 用+号不要用逗号
+#endif
     connect(ui->Dtk__Widget__DKeySequenceEdit, &DKeySequenceEdit::keySequenceChanged, [] (const QKeySequence &seq) {
         qDebug() << "Key sequence: " << seq;
     });
diff --git a/plugin/dtkuiplugin/dcustomermacrowidget.h b/plugin/dtkuiplugin/dcustomermacrowidget.h
@@ -7,6 +7,13 @@
 
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
+// 定义键位组合操作符，兼容DTK5和DTK6
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#define DTKEY_OPERATOR |
+#else
+#define DTKEY_OPERATOR +
+#endif
+
 #include <DFrame>
 #include <DArrowLineDrawer>
 #include <DButtonBox>
@@ -121,7 +128,7 @@ public:
         }                                                                                                   \
         if (IS_SAME(UPPER_NAME, DKeySequenceEdit)) {                                                        \
             DKeySequenceEdit *w = new DKeySequenceEdit(parent);                                             \
-            w->setKeySequence(QKeySequence(Qt::CTRL + Qt::Key_A)); /* 用+号不要用逗号 */                      \
+            w->setKeySequence(QKeySequence(Qt::CTRL DTKEY_OPERATOR Qt::Key_A)); /* 用+号不要用逗号 */                      \
             return reinterpret_cast<UPPER_NAME *>(w);                                                       \
         }                                                                                                   \
         if (IS_SAME(UPPER_NAME, DWaterProgress)) {                                                          \
diff --git a/src/util/daccessibilitychecker.cpp b/src/util/daccessibilitychecker.cpp
@@ -95,7 +95,7 @@ void DAccessibilityCheckerPrivate::checkWidgetName()
     for (const QWidget *topLevelWidget : topLevelWidgets)
         childrenList.append(topLevelWidget->findChildren<QWidget *>());
 
-    for (auto child : qAsConst(childrenList)) {
+    for (auto child : std::as_const(childrenList)) {
         if (q->isIgnore(DAccessibilityChecker::Widget, child)) {
             widgetIgnoredCount++;
             continue;
@@ -134,7 +134,7 @@ void DAccessibilityCheckerPrivate::checkViewItemName()
     for (const QWidget *topLevelWidget : topLevelWidgets)
         listViewList.append(topLevelWidget->findChildren<QAbstractItemView *>());
 
-    for (auto absListView : qAsConst(listViewList)) {
+    for (auto absListView : std::as_const(listViewList)) {
         if (q->isIgnore(DAccessibilityChecker::ViewItem, absListView))
             continue;
 
diff --git a/src/widgets/daboutdialog.cpp b/src/widgets/daboutdialog.cpp
@@ -372,7 +372,11 @@ QPixmap DAboutDialog::companyLogo() const
 {
     D_DC(DAboutDialog);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return d->companyLogoLabel->pixmap(Qt::ReturnByValue);
+#else
     return d->companyLogoLabel->pixmap();
+#endif
 }
 
 /*!
diff --git a/src/widgets/dapplication.cpp b/src/widgets/dapplication.cpp
@@ -179,7 +179,7 @@ bool DApplicationPrivate::setSingleInstanceBySemaphore(const QString &key)
     singleInstance = tryAcquireSystemSemaphore(&ss);
 
     if (singleInstance) {
-        QtConcurrent::run([this] {
+        (void)QtConcurrent::run([this] {
             QPointer<DApplication> that = q_func();
 
             while (ss.acquire() && singleInstance)
diff --git a/src/widgets/ddialog.cpp b/src/widgets/ddialog.cpp
@@ -626,7 +626,7 @@ void DDialog::insertButton(int index, QAbstractButton *button, bool isDefault)
 
     const QString &text = button->text();
 
-    if (text.count() == 2) {
+    if (text.size() == 2) {
         for (const QChar &ch : text) {
             switch (ch.script()) {
             case QChar::Script_Han:
diff --git a/src/widgets/dimageviewer.cpp b/src/widgets/dimageviewer.cpp
@@ -909,18 +909,30 @@ bool DImageViewer::event(QEvent *event)
         }
         case QEvent::TouchUpdate: {
             QTouchEvent *touchEvent = dynamic_cast<QTouchEvent *>(event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->points();
+#else
             QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
+#endif
             if (touchPoints.size() > touchCount) {
                 touchCount = touchPoints.size();
             }
             break;
         }
         case QEvent::TouchEnd: {
             QTouchEvent *touchEvent = dynamic_cast<QTouchEvent *>(event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->points();
+#else
             QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
+#endif
             if (touchPoints.size() == 1 && touchCount <= 1) {
                 // Swipe gesture.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                qreal offset = touchPoints.at(0).lastPosition().x() - touchPoints.at(0).pressPosition().x();
+#else
                 qreal offset = touchPoints.at(0).lastPos().x() - touchPoints.at(0).startPos().x();
+#endif
                 if (qAbs(offset) > 200) {
                     if (offset > 0) {
                         Q_EMIT requestPreviousImage();
diff --git a/src/widgets/dipv4lineedit.cpp b/src/widgets/dipv4lineedit.cpp
@@ -259,7 +259,7 @@ int DIpv4LineEdit::cursorPosition() const
             cursorPosition += edit->cursorPosition();
             break;
         } else {
-            cursorPosition += edit->text().count() + 1;
+            cursorPosition += edit->text().size() + 1;
         }
     }
 
@@ -339,8 +339,8 @@ void DIpv4LineEdit::setCursorPosition(int cursorPosition)
     D_D(DIpv4LineEdit);
 
     for (QLineEdit *edit : d->editList) {
-        if (cursorPosition > edit->text().count()) {
-            cursorPosition -= edit->text().count();
+        if (cursorPosition > edit->text().size()) {
+            cursorPosition -= edit->text().size();
             --cursorPosition;
         } else {
             edit->setCursorPosition(cursorPosition);
@@ -380,9 +380,9 @@ void DIpv4LineEdit::setSelection(int start, int length)
     D_D(DIpv4LineEdit);
 
     for (QLineEdit *edit : d->editList) {
-        if (edit->text().count() > start) {
-            if (edit->text().count() < length + start) {
-                int tmp_length = edit->text().count() - start;
+        if (edit->text().size() > start) {
+            if (edit->text().size() < length + start) {
+                int tmp_length = edit->text().size() - start;
 
                 edit->setSelection(start, tmp_length);
 
@@ -395,7 +395,7 @@ void DIpv4LineEdit::setSelection(int start, int length)
             edit->setSelection(edit->cursorPosition(), 0);
         }
 
-        start -= edit->text().count();
+        start -= edit->text().size();
     }
 
     QLineEdit::setSelection(start, length);
@@ -445,7 +445,7 @@ bool DIpv4LineEdit::eventFilter(QObject *obj, QEvent *e)
 
                 D_D(DIpv4LineEdit);
                 if (event->key() <= Qt::Key_9 && event->key() >= Qt::Key_0) {
-                    if (edit->cursorPosition() == edit->text().count()) {
+                    if (edit->cursorPosition() == edit->text().size()) {
                         QRegularExpression rx(RX_PATTERN_IP);
 
                         const QString number = QString::number(event->key() - Qt::Key_0);
diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp
@@ -282,16 +282,26 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e)
             return;
         bool found = false;
         for (int i = 0; i < possibleKeys.size(); ++i) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (possibleKeys.at(i).toCombined() - nextKey == static_cast<int>(e->modifiers())
+                || (possibleKeys.at(i).toCombined() == nextKey && e->modifiers() == Qt::ShiftModifier)) {
+                nextKey = possibleKeys.at(i).toCombined();
+#else
             if (static_cast<int>(possibleKeys.at(i)) - nextKey == static_cast<int>(e->modifiers())
                 || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) {
                 nextKey = possibleKeys.at(i);
+#endif
                 found = true;
                 break;
             }
         }
         // Use as fallback
         if (!found)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            nextKey = possibleKeys.first().toCombined();
+#else
             nextKey = possibleKeys.first();
+#endif
     }
 
     QString modifiers = QKeySequence(e->modifiers()).toString();
diff --git a/src/widgets/dprintpreviewdialog.cpp b/src/widgets/dprintpreviewdialog.cpp
@@ -1145,7 +1145,11 @@ void DPrintPreviewDialogPrivate::initconnections()
             pageRangeError(NullTip);
         }
     });
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QObject::connect(sidebysideCheckBox, &DCheckBox::checkStateChanged, q, [this](int status) {
+#else
     QObject::connect(sidebysideCheckBox, &DCheckBox::stateChanged, q, [this](int status) {
+#endif
         if (status == 0) {
             if (isActualPrinter(printDeviceCombo->currentText()))
                 settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_PageOrder_SequentialPrint, true);
@@ -1257,7 +1261,11 @@ void DPrintPreviewDialogPrivate::initconnections()
     QObject::connect(marginRightSpin, SIGNAL(valueChanged(double)), q, SLOT(_q_marginspinChanged(double)));
     QObject::connect(marginLeftSpin, SIGNAL(valueChanged(double)), q, SLOT(_q_marginspinChanged(double)));
     QObject::connect(marginBottomSpin, SIGNAL(valueChanged(double)), q, SLOT(_q_marginspinChanged(double)));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QObject::connect(duplexCheckBox, SIGNAL(checkStateChanged(int)), q, SLOT(_q_checkStateChanged(int)));
+#else
     QObject::connect(duplexCheckBox, SIGNAL(stateChanged(int)), q, SLOT(_q_checkStateChanged(int)));
+#endif
     QObject::connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, pview, &DPrintPreviewWidget::themeTypeChanged);
     QObject::connect(marginTopSpin, SIGNAL(editingFinished()), q, SLOT(_q_marginEditFinished()));
     QObject::connect(marginRightSpin, SIGNAL(editingFinished()), q, SLOT(_q_marginEditFinished()));
diff --git a/src/widgets/dprintpreviewwidget.cpp b/src/widgets/dprintpreviewwidget.cpp
@@ -51,7 +51,7 @@ static void saveImageToFile(int index, const QString &outPutFileName, const QStr
     QString tmpString = outPutFileName.left(outPutFileName.length() - suffix.length() - 1) + QString("(%1)").arg(QString::number(index + 1)) + stres;
 
     // 多线程保存文件修复大文件卡顿问题
-    QtConcurrent::run(QThreadPool::globalInstance(), [srcImage, tmpString, isJpegImage] {
+    (void)QtConcurrent::run(QThreadPool::globalInstance(), [srcImage, tmpString, isJpegImage] {
         const QFileInfo file(tmpString);
         const auto fileName = file.absolutePath() + "/" + truncateFileName(file.fileName());
         if (!srcImage.save(fileName, isJpegImage ? "JPEG" : "PNG")) {
@@ -114,7 +114,7 @@ void DPrintPreviewWidgetPrivate::populateScene()
     background->setBrush(Qt::white);
     background->setPen(Qt::NoPen);
 
-    for (auto *page : qAsConst(pages))
+    for (auto *page : std::as_const(pages))
         scene->removeItem(page);
     qDeleteAll(pages);
     pages.clear();
@@ -1152,13 +1152,13 @@ void DPrintPreviewWidgetPrivate::updateNumberUpContent()
 
     // 调整序号角标
     QVector<int> nVector;
-    for (auto &i : qAsConst(numberUpPrintData->previewPictures)) {
+    for (auto &i : std::as_const(numberUpPrintData->previewPictures)) {
         nVector.append(i.first);
     }
 
     // 调整序号坐标显示位置（纸张大小发生改变时）
     QVector<QPointF> paintPoints;
-    for (auto &p : qAsConst(numberUpPrintData->paintPoints)) {
+    for (auto &p : std::as_const(numberUpPrintData->paintPoints)) {
         paintPoints.append(p + QPointF(previewPrinter->pageLayout().paintRectPixels(previewPrinter->resolution()).width() * numberUpPrintData->scaleRatio, 0));
     }
 
diff --git a/src/widgets/dsettingswidgetfactory.cpp b/src/widgets/dsettingswidgetfactory.cpp
@@ -270,7 +270,11 @@ QPair<QWidget *, QWidget *> createCheckboxOptionHandle(QObject *opt)
     rightWidget->setAccessibleName("OptionCheckbox");
     rightWidget->setChecked(option->value().toBool());
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    option->connect(rightWidget, &QCheckBox::checkStateChanged,
+#else
     option->connect(rightWidget, &QCheckBox::stateChanged,
+#endif
     option, [ = ](int status) {
         option->setValue(status == Qt::Checked);
     });
diff --git a/src/widgets/dstyle.cpp b/src/widgets/dstyle.cpp
@@ -2117,7 +2117,7 @@ DStyle::StyleState DStyle::getState(const QStyleOption *option)
 
 static DStyle::StateFlags getFlags(const QStyleOption *option)
 {
-    DStyle::StateFlags flags{0};
+    DStyle::StateFlags flags{};
 
     if (option->state.testFlag(DStyle::State_On)) {
         flags |= DStyle::SS_CheckedFlag;
diff --git a/src/widgets/dstyleditemdelegate.cpp b/src/widgets/dstyleditemdelegate.cpp
@@ -490,7 +490,7 @@ class DStyledItemDelegatePrivate : public DCORE_NAMESPACE::DObjectPrivate
         if (lastWidgets.isEmpty() && currentWidgets.isEmpty())
             return;
 
-        for (const auto &widget : qAsConst(lastWidgets)) {
+        for (const auto &widget : std::as_const(lastWidgets)) {
             if (currentWidgets.contains(widget))
                 continue;
             if (widget && widget->isVisible())
diff --git a/src/widgets/dtabbar.cpp b/src/widgets/dtabbar.cpp
diff --git a/src/widgets/dtooltip.cpp b/src/widgets/dtooltip.cpp
diff --git a/src/widgets/private/dprintpreviewwidget_p.h b/src/widgets/private/dprintpreviewwidget_p.h
diff --git a/src/widgets/private/dtitlebareditpanel.cpp b/src/widgets/private/dtitlebareditpanel.cpp
diff --git a/src/widgets/private/dtitlebarsettingsimpl.cpp b/src/widgets/private/dtitlebarsettingsimpl.cpp
diff --git a/tests/testcases/widgets/ut_dslider.cpp b/tests/testcases/widgets/ut_dslider.cpp

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,11 @@ QPixmap DAboutDialog::companyLogo() const`
`372`	`372`	`{`
`373`	`373`	`D_DC(DAboutDialog);`
`374`	`374`
	`375`	`+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)`
	`376`	`+ return d->companyLogoLabel->pixmap(Qt::ReturnByValue);`
	`377`	`+#else`
`375`	`378`	`return d->companyLogoLabel->pixmap();`
	`379`	`+#endif`
`376`	`380`	`}`
`377`	`381`
`378`	`382`	`/*!`