whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1713869210

bb10
Qt CI Bot 2024-04-23 14:44:27 +00:00
parent 2342fa5fe2 b0325c7992
commit b66089a453
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -1393,8 +1393,8 @@ void WriteInitialization::writeProperties(const QString &varName,
case DomProperty::CursorShape:
if (p->hasAttributeStdset() && !p->attributeStdset())
varNewName += language::derefPointer + "viewport()"_L1;
propertyValue = "QCursor(Qt"_L1 + language::qualifier
+ p->elementCursorShape() + u')';
propertyValue = "QCursor(Qt"_L1 + language::qualifier + "CursorShape"_L1
+ language::qualifier + p->elementCursorShape() + u')';
break;
case DomProperty::Enum:
propertyValue = p->elementEnum();
@ -1708,8 +1708,9 @@ static void writeIconAddFile(QTextStream &output, const QString &indent,
{
output << indent << iconName << ".addFile("
<< language::qstring(fileName, indent) << ", QSize(), QIcon"
<< language::qualifier << mode << ", QIcon" << language::qualifier
<< state << ')' << language::eol;
<< language::qualifier << "Mode" << language::qualifier << mode
<< ", QIcon" << language::qualifier << "State" << language::qualifier << state
<< ')' << language::eol;
}
// Post 4.4 write resource icon
@ -1757,7 +1758,8 @@ static void writeIconAddPixmap(QTextStream &output, const QString &indent,
const char *mode, const char *state)
{
output << indent << iconName << ".addPixmap(" << call << ", QIcon"
<< language::qualifier << mode << ", QIcon" << language::qualifier
<< language::qualifier << "Mode" << language::qualifier << mode
<< ", QIcon" << language::qualifier << "State" << language::qualifier
<< state << ')' << language::eol;
}

6
tests/auto/tools/uic/baseline/icontheme.ui.h
View File

@ -38,7 +38,7 @@ public:
fileicon = new QPushButton(Form);
fileicon->setObjectName("fileicon");
QIcon icon;
icon.addFile(QString::fromUtf8("image1.png"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8("image1.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
fileicon->setIcon(icon);
verticalLayout->addWidget(fileicon);
@ -50,7 +50,7 @@ public:
if (QIcon::hasThemeIcon(iconThemeName)) {
icon1 = QIcon::fromTheme(iconThemeName);
} else {
icon1.addFile(QString::fromUtf8("image7.png"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8("image7.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
}
fileandthemeicon->setIcon(icon1);
@ -76,7 +76,7 @@ public:
if (QIcon::hasThemeIcon(QIcon::ThemeIcon::EditCopy)) {
icon4 = QIcon::fromTheme(QIcon::ThemeIcon::EditCopy);
} else {
icon4.addFile(QString::fromUtf8("image7.png"), QSize(), QIcon::Normal, QIcon::Off);
icon4.addFile(QString::fromUtf8("image7.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
}
fileandthemeenum->setIcon(icon4);

8
tests/auto/tools/uic/baseline/languagesdialog.ui.h
View File

@ -55,7 +55,7 @@ public:
upButton->setObjectName("upButton");
upButton->setEnabled(false);
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/up.png"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/images/up.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
upButton->setIcon(icon);
hboxLayout->addWidget(upButton);
@ -64,7 +64,7 @@ public:
downButton->setObjectName("downButton");
downButton->setEnabled(false);
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/down.png"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/images/down.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
downButton->setIcon(icon1);
hboxLayout->addWidget(downButton);
@ -73,7 +73,7 @@ public:
removeButton->setObjectName("removeButton");
removeButton->setEnabled(false);
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/images/editdelete.png"), QSize(), QIcon::Normal, QIcon::Off);
icon2.addFile(QString::fromUtf8(":/images/editdelete.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
removeButton->setIcon(icon2);
hboxLayout->addWidget(removeButton);
@ -82,7 +82,7 @@ public:
openFileButton->setObjectName("openFileButton");
openFileButton->setEnabled(true);
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/images/mac/fileopen.png"), QSize(), QIcon::Normal, QIcon::Off);
icon3.addFile(QString::fromUtf8(":/images/mac/fileopen.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off);
openFileButton->setIcon(icon3);
hboxLayout->addWidget(openFileButton);

8
tests/auto/tools/uic/baseline/pixmapfunction.ui.h
View File

@ -42,10 +42,10 @@ public:
pushButton = new QPushButton(Form);
pushButton->setObjectName("pushButton");
QIcon icon;
icon.addPixmap(QPixmap(pixmapFunction("buttonIconNormalOff")), QIcon::Normal, QIcon::Off);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconNormalOn")), QIcon::Normal, QIcon::On);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconDisabledOff")), QIcon::Disabled, QIcon::Off);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconDisabledOn")), QIcon::Disabled, QIcon::On);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconNormalOff")), QIcon::Mode::Normal, QIcon::State::Off);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconNormalOn")), QIcon::Mode::Normal, QIcon::State::On);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconDisabledOff")), QIcon::Mode::Disabled, QIcon::State::Off);
icon.addPixmap(QPixmap(pixmapFunction("buttonIconDisabledOn")), QIcon::Mode::Disabled, QIcon::State::On);
pushButton->setIcon(icon);
verticalLayout->addWidget(pushButton);

5
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
View File

@ -3044,7 +3044,6 @@ void tst_QGraphicsScene::tabFocus_emptyScene()
widget.setLayout(layout);
widget.setWindowTitle(QTest::currentTestFunction());
widget.show();
QApplicationPrivate::setActiveWindow(&widget);
widget.activateWindow();
QVERIFY(QTest::qWaitForWindowActive(&widget));
@ -3096,7 +3095,6 @@ void tst_QGraphicsScene::tabFocus_sceneWithFocusableItems()
widget.setWindowTitle(QTest::currentTestFunction());
widget.setLayout(layout);
widget.show();
QApplicationPrivate::setActiveWindow(&widget);
widget.activateWindow();
QVERIFY(QTest::qWaitForWindowActive(&widget));
@ -3825,7 +3823,6 @@ void tst_QGraphicsScene::inputMethod()
view.resize(m_testSize);
view.show();
view.setWindowTitle(QTest::currentTestFunction());
QApplicationPrivate::setActiveWindow(&view);
view.setFocus();
QVERIFY(QTest::qWaitForWindowActive(&view));
QCOMPARE(QApplication::activeWindow(), &view);
@ -4069,7 +4066,6 @@ void tst_QGraphicsScene::isActive()
view1->setVisible(false);
toplevel1.show();
QApplicationPrivate::setActiveWindow(&toplevel1);
QVERIFY(QTest::qWaitForWindowActive(&toplevel1));
QCOMPARE(QApplication::activeWindow(), &toplevel1);
@ -4246,7 +4242,6 @@ void tst_QGraphicsScene::isActive()
toplevel3.show();
QApplicationPrivate::setActiveWindow(&toplevel3);
QVERIFY(QTest::qWaitForWindowActive(&toplevel3));
QCOMPARE(QApplication::activeWindow(), &toplevel3);