From 7dd14c60096a4bfbdba866a5e467de283c9eaee2 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 17 Oct 2019 10:03:20 +0200 Subject: Move CBOR debug stream functions into qcborvalue.cpp Some of them were already there, and this way they continue to function, even if the cborstream feature is turned off. Change-Id: I6828d2f525ab0a1437fc940a0fe786f6fa56fd6a Reviewed-by: Lars Knoll --- src/corelib/serialization/qcborstream.cpp | 112 ------------------------------ src/corelib/serialization/qcborvalue.cpp | 106 ++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 112 deletions(-) diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index c598eee213..a232f7eef7 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -166,21 +166,6 @@ Q_STATIC_ASSERT(int(QCborStreamReader::Invalid) == CborInvalidType); QCborStreamReader::toSimpleType(), QCborValue::isSimpleType(), QCborValue::toSimpleType() */ -Q_CORE_EXPORT const char *qt_cbor_simpletype_id(QCborSimpleType st) -{ - switch (st) { - case QCborSimpleType::False: - return "False"; - case QCborSimpleType::True: - return "True"; - case QCborSimpleType::Null: - return "Null"; - case QCborSimpleType::Undefined: - return "Undefined"; - } - return nullptr; -} - #if !defined(QT_NO_DATASTREAM) QDataStream &operator<<(QDataStream &ds, QCborSimpleType st) { @@ -196,18 +181,6 @@ QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) } #endif -#if !defined(QT_NO_DEBUG_STREAM) -QDebug operator<<(QDebug dbg, QCborSimpleType st) -{ - QDebugStateSaver saver(dbg); - const char *id = qt_cbor_simpletype_id(st); - if (id) - return dbg.nospace() << "QCborSimpleType::" << id; - - return dbg.nospace() << "QCborSimpleType(" << uint(st) << ')'; -} -#endif - /*! \enum QCborTag \relates @@ -230,79 +203,6 @@ QDebug operator<<(QDebug dbg, QCborSimpleType st) QCborValue::isTag(), QCborValue::tag() */ -Q_CORE_EXPORT const char *qt_cbor_tag_id(QCborTag tag) -{ - // Casting to QCborKnownTags's underlying type will make the comparison - // below fail if the tag value is out of range. - auto n = std::underlying_type::type(tag); - if (QCborTag(n) == tag) { - switch (QCborKnownTags(n)) { - case QCborKnownTags::DateTimeString: - return "DateTimeString"; - case QCborKnownTags::UnixTime_t: - return "UnixTime_t"; - case QCborKnownTags::PositiveBignum: - return "PositiveBignum"; - case QCborKnownTags::NegativeBignum: - return "NegativeBignum"; - case QCborKnownTags::Decimal: - return "Decimal"; - case QCborKnownTags::Bigfloat: - return "Bigfloat"; - case QCborKnownTags::COSE_Encrypt0: - return "COSE_Encrypt0"; - case QCborKnownTags::COSE_Mac0: - return "COSE_Mac0"; - case QCborKnownTags::COSE_Sign1: - return "COSE_Sign1"; - case QCborKnownTags::ExpectedBase64url: - return "ExpectedBase64url"; - case QCborKnownTags::ExpectedBase64: - return "ExpectedBase64"; - case QCborKnownTags::ExpectedBase16: - return "ExpectedBase16"; - case QCborKnownTags::EncodedCbor: - return "EncodedCbor"; - case QCborKnownTags::Url: - return "Url"; - case QCborKnownTags::Base64url: - return "Base64url"; - case QCborKnownTags::Base64: - return "Base64"; - case QCborKnownTags::RegularExpression: - return "RegularExpression"; - case QCborKnownTags::MimeMessage: - return "MimeMessage"; - case QCborKnownTags::Uuid: - return "Uuid"; - case QCborKnownTags::COSE_Encrypt: - return "COSE_Encrypt"; - case QCborKnownTags::COSE_Mac: - return "COSE_Mac"; - case QCborKnownTags::COSE_Sign: - return "COSE_Sign"; - case QCborKnownTags::Signature: - return "Signature"; - } - } - return nullptr; -} - -#if !defined(QT_NO_DEBUG_STREAM) -QDebug operator<<(QDebug dbg, QCborTag tag) -{ - QDebugStateSaver saver(dbg); - const char *id = qt_cbor_tag_id(tag); - dbg.nospace() << "QCborTag("; - if (id) - dbg.nospace() << "QCborKnownTags::" << id; - else - dbg.nospace() << quint64(tag); - - return dbg << ')'; -} -#endif - /*! \enum QCborKnownTags \relates @@ -381,18 +281,6 @@ QDebug operator<<(QDebug dbg, QCborTag tag) QCborValue::isTag(), QCborValue::tag() */ -#if !defined(QT_NO_DEBUG_STREAM) -QDebug operator<<(QDebug dbg, QCborKnownTags tag) -{ - QDebugStateSaver saver(dbg); - const char *id = qt_cbor_tag_id(QCborTag(int(tag))); - if (id) - return dbg.nospace() << "QCborKnownTags::" << id; - - return dbg.nospace() << "QCborKnownTags(" << int(tag) << ')'; -} -#endif - /*! \class QCborError \inmodule QtCore diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index b77cfd5c70..23595f4092 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -2976,6 +2976,112 @@ QDebug operator<<(QDebug dbg, const QCborValue &v) dbg.nospace() << "QCborValue("; return debugContents(dbg, v) << ')'; } + +Q_CORE_EXPORT const char *qt_cbor_simpletype_id(QCborSimpleType st) +{ + switch (st) { + case QCborSimpleType::False: + return "False"; + case QCborSimpleType::True: + return "True"; + case QCborSimpleType::Null: + return "Null"; + case QCborSimpleType::Undefined: + return "Undefined"; + } + return nullptr; +} + +QDebug operator<<(QDebug dbg, QCborSimpleType st) +{ + QDebugStateSaver saver(dbg); + const char *id = qt_cbor_simpletype_id(st); + if (id) + return dbg.nospace() << "QCborSimpleType::" << id; + + return dbg.nospace() << "QCborSimpleType(" << uint(st) << ')'; +} + +Q_CORE_EXPORT const char *qt_cbor_tag_id(QCborTag tag) +{ + // Casting to QCborKnownTags's underlying type will make the comparison + // below fail if the tag value is out of range. + auto n = std::underlying_type::type(tag); + if (QCborTag(n) == tag) { + switch (QCborKnownTags(n)) { + case QCborKnownTags::DateTimeString: + return "DateTimeString"; + case QCborKnownTags::UnixTime_t: + return "UnixTime_t"; + case QCborKnownTags::PositiveBignum: + return "PositiveBignum"; + case QCborKnownTags::NegativeBignum: + return "NegativeBignum"; + case QCborKnownTags::Decimal: + return "Decimal"; + case QCborKnownTags::Bigfloat: + return "Bigfloat"; + case QCborKnownTags::COSE_Encrypt0: + return "COSE_Encrypt0"; + case QCborKnownTags::COSE_Mac0: + return "COSE_Mac0"; + case QCborKnownTags::COSE_Sign1: + return "COSE_Sign1"; + case QCborKnownTags::ExpectedBase64url: + return "ExpectedBase64url"; + case QCborKnownTags::ExpectedBase64: + return "ExpectedBase64"; + case QCborKnownTags::ExpectedBase16: + return "ExpectedBase16"; + case QCborKnownTags::EncodedCbor: + return "EncodedCbor"; + case QCborKnownTags::Url: + return "Url"; + case QCborKnownTags::Base64url: + return "Base64url"; + case QCborKnownTags::Base64: + return "Base64"; + case QCborKnownTags::RegularExpression: + return "RegularExpression"; + case QCborKnownTags::MimeMessage: + return "MimeMessage"; + case QCborKnownTags::Uuid: + return "Uuid"; + case QCborKnownTags::COSE_Encrypt: + return "COSE_Encrypt"; + case QCborKnownTags::COSE_Mac: + return "COSE_Mac"; + case QCborKnownTags::COSE_Sign: + return "COSE_Sign"; + case QCborKnownTags::Signature: + return "Signature"; + } + } + return nullptr; +} + +QDebug operator<<(QDebug dbg, QCborTag tag) +{ + QDebugStateSaver saver(dbg); + const char *id = qt_cbor_tag_id(tag); + dbg.nospace() << "QCborTag("; + if (id) + dbg.nospace() << "QCborKnownTags::" << id; + else + dbg.nospace() << quint64(tag); + + return dbg << ')'; +} + +QDebug operator<<(QDebug dbg, QCborKnownTags tag) +{ + QDebugStateSaver saver(dbg); + const char *id = qt_cbor_tag_id(QCborTag(int(tag))); + if (id) + return dbg.nospace() << "QCborKnownTags::" << id; + + return dbg.nospace() << "QCborKnownTags(" << int(tag) << ')'; +} #endif #ifndef QT_NO_DATASTREAM -- cgit v1.2.3 From c5e9d7e504172707f7705d03ae27006c45eb5eac Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 28 Aug 2019 16:09:25 +0200 Subject: Generate metatypes.json for QtCore, QtGui, and QtWidgets These libraries contain types which are exposed to QML from qtdeclarative. Change-Id: Ie0edaef94fcb40074b6f6b2ea1a1c3a77ed3e9a9 Reviewed-by: Simon Hausmann --- src/corelib/corelib.pro | 2 +- src/gui/gui.pro | 2 +- src/widgets/widgets.pro | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 452d2db0fd..b4f301878d 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -1,6 +1,6 @@ TARGET = QtCore QT = -CONFIG += exceptions +CONFIG += exceptions metatypes install_metatypes MODULE = core # not corelib, as per project file MODULE_CONFIG = moc resources diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 45c8c05162..decfb364cf 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -35,7 +35,7 @@ testcocoon { osx: LIBS_PRIVATE += -framework AppKit darwin: LIBS_PRIVATE += -framework CoreGraphics -CONFIG += simd optimize_full +CONFIG += simd optimize_full metatypes install_metatypes include(accessible/accessible.pri) include(kernel/kernel.pri) diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 6f807e1696..2aa56ded93 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -9,6 +9,8 @@ msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x65000000 TRACEPOINT_PROVIDER = $$PWD/qtwidgets.tracepoints CONFIG += qt_tracepoints +CONFIG += metatypes install_metatypes + QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf #platforms -- cgit v1.2.3 From ee4a604a2e784fd22496a60c0e134fdb97b3140e Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 10 Oct 2019 16:11:19 +0200 Subject: tst_qdialog: Wait for exposed instead of active MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the test pass on Wayland. Task-number: QTBUG-62188 Change-Id: Ib67cf8913055bbe753f71791095aff035342c18d Reviewed-by: Tor Arne Vestbø --- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index a494d7119a..1af3bade0e 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -222,7 +222,7 @@ void tst_QDialog::defaultButtons() testWidget.show(); QApplication::setActiveWindow(&testWidget); - QVERIFY(QTest::qWaitForWindowActive(&testWidget)); + QVERIFY(QTest::qWaitForWindowExposed(&testWidget)); push->setDefault(true); QVERIFY(push->isDefault()); -- cgit v1.2.3 From 4b5ff2be7c2c182512577ad1f96f8c2d4e93a843 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 11 Oct 2019 10:08:23 +0200 Subject: QGraphicsView tests: Prefer exposed over active MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes the tests pass on Wayland. Task-number: QTBUG-62188 Change-Id: I5860c1ae6dd3d15632d827f4e357cb6c2cc9c5e3 Reviewed-by: Tor Arne Vestbø --- tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | 2 +- .../graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp | 2 +- .../graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp | 2 +- .../graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index f8f40e8488..f910b12cc6 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -826,7 +826,7 @@ void tst_QFileSystemModel::sort() tree.setModel(myModel.data()); tree.show(); tree.resize(800, 800); - QVERIFY(QTest::qWaitForWindowActive(&tree)); + QVERIFY(QTest::qWaitForWindowExposed(&tree)); tree.header()->setSortIndicator(1, Qt::DescendingOrder); tree.header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); QStringList dirsToOpen; diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp index 973a73a4a9..eaad5e478d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp @@ -166,7 +166,7 @@ void tst_QGraphicsEffectSource::initTestCase() scene->addItem(item); view = new QGraphicsView(scene); view->show(); - QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(QTest::qWaitForWindowExposed(view)); } void tst_QGraphicsEffectSource::cleanupTestCase() diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 2f0c43552f..ad17c2a557 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -1826,7 +1826,7 @@ void tst_QGraphicsGridLayout::removeLayout() QGraphicsView view(&scene); view.show(); - QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QRectF r1 = textEdit->geometry(); QRectF r2 = pushButton->geometry(); diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 9369470ce5..1c8faa6b38 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -1518,7 +1518,7 @@ void tst_QGraphicsLinearLayout::removeLayout() QGraphicsView view(&scene); view.show(); - QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QRectF r1 = textEdit->geometry(); QRectF r2 = pushButton->geometry(); -- cgit v1.2.3 From 898ab9677ec1c368c1394cf7e15ffb7793417d2e Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 16 Oct 2019 09:53:41 +0200 Subject: Linux print dialog: use simpler terminology for duplex Make the dialog more user-friendly by using simple terms. Fixes: QTBUG-79100 Change-Id: Ie4fa61cd0dc2a7fe5af9fd5834abe9d0e88c55de Reviewed-by: Paul Wicking Reviewed-by: Michael Weghorn --- src/printsupport/dialogs/qprintsettingsoutput.ui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/printsupport/dialogs/qprintsettingsoutput.ui b/src/printsupport/dialogs/qprintsettingsoutput.ui index 290111a98c..360634aaa7 100644 --- a/src/printsupport/dialogs/qprintsettingsoutput.ui +++ b/src/printsupport/dialogs/qprintsettingsoutput.ui @@ -351,13 +351,13 @@ - Duplex Printing + Double Sided Printing - None + Off true @@ -367,14 +367,14 @@ - Long side + Long side binding - Short side + Short side binding -- cgit v1.2.3 From 328122dddd03ad5501577db0b895ccab89dbc54d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 10 Oct 2019 09:40:00 +0200 Subject: tst_qiconhighdpi: fix target name CMake will complain that we have a duplicate test name otherwise. Generally it makes a lot of sense to name the test binary the same as the test itself. Change-Id: I27c4b51e6a2869f025e1100f1a9dd6b54ebdaf55 Reviewed-by: Leander Beernaert Reviewed-by: Mitch Curtis Reviewed-by: Morten Kristensen Reviewed-by: Liang Qi --- tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro b/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro index 17553158bc..49c615721b 100644 --- a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro +++ b/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro @@ -1,5 +1,5 @@ CONFIG += testcase -TARGET = tst_qicon +TARGET = tst_qiconhighdpi QT += testlib SOURCES += tst_qiconhighdpi.cpp -- cgit v1.2.3