diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
tree | a67e82fde179fa727172fff9098758d60912189d /tests | |
parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'tests')
130 files changed, 1884 insertions, 1213 deletions
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 3fa765e2fa..a7dc869805 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -1243,6 +1243,7 @@ void tst_QFileInfo::isSymLink_data() QFile::remove("link.lnk"); QFile::remove("brokenlink.lnk"); QFile::remove("dummyfile"); + QFile::remove("relative/link.lnk"); QFile file1(m_sourceFile); QVERIFY(file1.link("link.lnk")); @@ -1259,6 +1260,12 @@ void tst_QFileInfo::isSymLink_data() QTest::newRow("existent file") << m_sourceFile << false << ""; QTest::newRow("link") << "link.lnk" << true << QFileInfo(m_sourceFile).absoluteFilePath(); QTest::newRow("broken link") << "brokenlink.lnk" << true << QFileInfo("dummyfile").absoluteFilePath(); + +#ifndef Q_OS_WIN + QDir::current().mkdir("relative"); + QFile::link("../dummyfile", "relative/link.lnk"); + QTest::newRow("relative link") << "relative/link.lnk" << true << QFileInfo("dummyfile").absoluteFilePath(); +#endif #endif } diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp index a76fd4703e..a0188f8ba9 100644 --- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp @@ -55,6 +55,10 @@ private slots: void readAllKeepPosition(); void writeInTextMode(); + void skip_data(); + void skip(); + void skipAfterPeek_data(); + void skipAfterPeek(); void transaction_data(); void transaction(); @@ -628,6 +632,93 @@ void tst_QIODevice::writeInTextMode() #endif } +void tst_QIODevice::skip_data() +{ + QTest::addColumn<bool>("sequential"); + QTest::addColumn<QByteArray>("data"); + QTest::addColumn<int>("read"); + QTest::addColumn<int>("skip"); + QTest::addColumn<int>("skipped"); + QTest::addColumn<char>("expect"); + + QByteArray bigData; + bigData.fill('a', 20000); + bigData[10001] = 'x'; + + bool sequential = true; + do { + QByteArray devName(sequential ? "sequential" : "random-access"); + + QTest::newRow(qPrintable(devName + "-small_data")) << true << QByteArray("abcdefghij") + << 3 << 6 << 6 << 'j'; + QTest::newRow(qPrintable(devName + "-big_data")) << true << bigData + << 1 << 10000 << 10000 << 'x'; + QTest::newRow(qPrintable(devName + "-beyond_the_end")) << true << bigData + << 1 << 20000 << 19999 << '\0'; + + sequential = !sequential; + } while (!sequential); +} + +void tst_QIODevice::skip() +{ + QFETCH(bool, sequential); + QFETCH(QByteArray, data); + QFETCH(int, read); + QFETCH(int, skip); + QFETCH(int, skipped); + QFETCH(char, expect); + char lastChar = 0; + + QScopedPointer<QIODevice> dev(sequential ? (QIODevice *) new SequentialReadBuffer(&data) + : (QIODevice *) new QBuffer(&data)); + dev->open(QIODevice::ReadOnly); + + for (int i = 0; i < read; ++i) + dev->getChar(nullptr); + + QCOMPARE(dev->skip(skip), skipped); + dev->getChar(&lastChar); + QCOMPARE(lastChar, expect); +} + +void tst_QIODevice::skipAfterPeek_data() +{ + QTest::addColumn<bool>("sequential"); + QTest::addColumn<QByteArray>("data"); + + QByteArray bigData; + for (int i = 0; i < 1000; ++i) + bigData += "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + QTest::newRow("sequential") << true << bigData; + QTest::newRow("random-access") << false << bigData; +} + +void tst_QIODevice::skipAfterPeek() +{ + QFETCH(bool, sequential); + QFETCH(QByteArray, data); + + QScopedPointer<QIODevice> dev(sequential ? (QIODevice *) new SequentialReadBuffer(&data) + : (QIODevice *) new QBuffer(&data)); + int readSoFar = 0; + qint64 bytesToSkip = 1; + + dev->open(QIODevice::ReadOnly); + forever { + QByteArray chunk = dev->peek(bytesToSkip); + if (chunk.isEmpty()) + break; + + QCOMPARE(dev->skip(bytesToSkip), qint64(chunk.size())); + QCOMPARE(chunk, data.mid(readSoFar, chunk.size())); + readSoFar += chunk.size(); + bytesToSkip <<= 1; + } + QCOMPARE(readSoFar, data.size()); +} + void tst_QIODevice::transaction_data() { QTest::addColumn<bool>("sequential"); diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index ff8ee3d168..fc9f50b15c 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -105,6 +105,7 @@ private slots: void stateChange(); void flags(); void cleanup(); + void testBlockingWindowShownAfterModalDialog(); private: QPoint m_availableTopLeft; @@ -2270,6 +2271,47 @@ void tst_QWindow::flags() QCOMPARE(window.flags(), baseFlags | Qt::WindowStaysOnTopHint); } +class EventWindow : public QWindow +{ +public: + EventWindow() : QWindow(), gotBlocked(false) {} + bool gotBlocked; +protected: + bool event(QEvent *e) + { + if (e->type() == QEvent::WindowBlocked) + gotBlocked = true; + return QWindow::event(e); + } +}; + +void tst_QWindow::testBlockingWindowShownAfterModalDialog() +{ + EventWindow normalWindow; + normalWindow.setFramePosition(m_availableTopLeft + QPoint(80, 80)); + normalWindow.resize(m_testWindowSize); + normalWindow.show(); + QVERIFY(QTest::qWaitForWindowExposed(&normalWindow)); + QVERIFY(!normalWindow.gotBlocked); + + QWindow dialog; + dialog.setFramePosition(m_availableTopLeft + QPoint(200, 200)); + dialog.resize(m_testWindowSize); + dialog.setModality(Qt::ApplicationModal); + dialog.setFlags(Qt::Dialog); + dialog.show(); + QVERIFY(QTest::qWaitForWindowExposed(&dialog)); + QVERIFY(normalWindow.gotBlocked); + + EventWindow normalWindowAfter; + normalWindowAfter.setFramePosition(m_availableTopLeft + QPoint(80, 80)); + normalWindowAfter.resize(m_testWindowSize); + QVERIFY(!normalWindowAfter.gotBlocked); + normalWindowAfter.show(); + QVERIFY(QTest::qWaitForWindowExposed(&normalWindowAfter)); + QVERIFY(normalWindowAfter.gotBlocked); +} + #include <tst_qwindow.moc> QTEST_MAIN(tst_QWindow) diff --git a/tests/auto/gui/text/qfont/BLACKLIST b/tests/auto/gui/text/qfont/BLACKLIST index 8890ec1ef3..295c61ff12 100644 --- a/tests/auto/gui/text/qfont/BLACKLIST +++ b/tests/auto/gui/text/qfont/BLACKLIST @@ -2,3 +2,5 @@ # QTBUG-46054 opensuse-13.1 opensuse-42.1 +[defaultFamily] +b2qt diff --git a/tests/auto/network/access/http2/http2srv.cpp b/tests/auto/network/access/http2/http2srv.cpp index d0686eb01c..663f40cbae 100644 --- a/tests/auto/network/access/http2/http2srv.cpp +++ b/tests/auto/network/access/http2/http2srv.cpp @@ -132,8 +132,23 @@ void Http2Server::startServer() if (!clearTextHTTP2) return; #endif - if (listen()) + if (listen()) { + if (clearTextHTTP2) + authority = QStringLiteral("127.0.0.1:%1").arg(serverPort()).toLatin1(); emit serverStarted(serverPort()); + } +} + +bool Http2Server::sendProtocolSwitchReply() +{ + Q_ASSERT(socket); + Q_ASSERT(clearTextHTTP2 && upgradeProtocol); + // The first and the last HTTP/1.1 response we send: + const char response[] = "HTTP/1.1 101 Switching Protocols\r\n" + "Connection: Upgrade\r\n" + "Upgrade: h2c\r\n\r\n"; + const qint64 size = sizeof response - 1; + return socket->write(response, size) == size; } void Http2Server::sendServerSettings() @@ -232,6 +247,7 @@ void Http2Server::incomingConnection(qintptr socketDescriptor) Q_ASSERT(set); // Stop listening: close(); + upgradeProtocol = true; QMetaObject::invokeMethod(this, "connectionEstablished", Qt::QueuedConnection); } else { @@ -275,19 +291,77 @@ quint32 Http2Server::clientSetting(Http2::Settings identifier, quint32 defaultVa return defaultValue; } +bool Http2Server::readMethodLine() +{ + // We know for sure that Qt did the right thing sending us the correct + // Request-line with CRLF at the end ... + // We're overly simplistic here but all we need to know - the method. + while (socket->bytesAvailable()) { + char c = 0; + if (socket->read(&c, 1) != 1) + return false; + if (c == '\n' && requestLine.endsWith('\r')) { + if (requestLine.startsWith("GET")) + requestType = QHttpNetworkRequest::Get; + else if (requestLine.startsWith("POST")) + requestType = QHttpNetworkRequest::Post; + else + requestType = QHttpNetworkRequest::Custom; // 'invalid'. + requestLine.clear(); + + return true; + } else { + requestLine.append(c); + } + } + + return false; +} + +bool Http2Server::verifyProtocolUpgradeRequest() +{ + Q_ASSERT(protocolUpgradeHandler.data()); + + bool connectionOk = false; + bool upgradeOk = false; + bool settingsOk = false; + + QHttpNetworkReplyPrivate *firstRequestReader = protocolUpgradeHandler->d_func(); + + // That's how we append them, that's what I expect to find: + for (const auto &header : firstRequestReader->fields) { + if (header.first == "Connection") + connectionOk = header.second.contains("Upgrade, HTTP2-Settings"); + else if (header.first == "Upgrade") + upgradeOk = header.second.contains("h2c"); + else if (header.first == "HTTP2-Settings") + settingsOk = true; + } + + return connectionOk && upgradeOk && settingsOk; +} + +void Http2Server::triggerGOAWAYEmulation() +{ + Q_ASSERT(testingGOAWAY); + auto timer = new QTimer(this); + timer->setSingleShot(true); + connect(timer, &QTimer::timeout, [this]() { + sendGOAWAY(quint32(connectionStreamID), quint32(INTERNAL_ERROR), 0); + }); + timer->start(goawayTimeout); +} + void Http2Server::connectionEstablished() { using namespace Http2; - if (testingGOAWAY) { - auto timer = new QTimer(this); - timer->setSingleShot(true); - connect(timer, &QTimer::timeout, [this]() { - sendGOAWAY(quint32(connectionStreamID), quint32(INTERNAL_ERROR), 0); - }); - timer->start(goawayTimeout); - return; - } + if (testingGOAWAY && !clearTextHTTP2) + return triggerGOAWAYEmulation(); + + // For clearTextHTTP2 we first have to respond with 'protocol switch' + // and then continue with whatever logic we have (testingGOAWAY or not), + // otherwise our 'peer' cannot process HTTP/2 frames yet. connect(socket.data(), SIGNAL(readyRead()), this, SLOT(readReady())); @@ -296,9 +370,17 @@ void Http2Server::connectionEstablished() waitingClientAck = false; waitingClientSettings = false; settingsSent = false; - // We immediately send our settings so that our client - // can use flow control correctly. - sendServerSettings(); + + if (clearTextHTTP2) { + requestLine.clear(); + // Now we have to handle HTTP/1.1 request. We use Get/Post in our test, + // so set requestType to something unsupported: + requestType = QHttpNetworkRequest::Options; + } else { + // We immediately send our settings so that our client + // can use flow control correctly. + sendServerSettings(); + } if (socket->bytesAvailable()) readReady(); @@ -328,7 +410,9 @@ void Http2Server::readReady() if (connectionError) return; - if (waitingClientPreface) { + if (upgradeProtocol) { + handleProtocolUpgrade(); + } else if (waitingClientPreface) { handleConnectionPreface(); } else { const auto status = reader.read(*socket); @@ -348,6 +432,79 @@ void Http2Server::readReady() QMetaObject::invokeMethod(this, "readReady", Qt::QueuedConnection); } +void Http2Server::handleProtocolUpgrade() +{ + using ReplyPrivate = QHttpNetworkReplyPrivate; + Q_ASSERT(upgradeProtocol); + + if (!protocolUpgradeHandler.data()) + protocolUpgradeHandler.reset(new Http11Reply); + + QHttpNetworkReplyPrivate *firstRequestReader = protocolUpgradeHandler->d_func(); + + // QHttpNetworkReplyPrivate parses ... reply. It will, unfortunately, fail + // on the first line ... which is a part of request. So we read this line + // and extract the method first. + if (firstRequestReader->state == ReplyPrivate::NothingDoneState) { + if (!readMethodLine()) + return; + + if (requestType != QHttpNetworkRequest::Get && requestType != QHttpNetworkRequest::Post) { + emit invalidRequest(1); + return; + } + + firstRequestReader->state = ReplyPrivate::ReadingHeaderState; + } + + if (!socket->bytesAvailable()) + return; + + if (firstRequestReader->state == ReplyPrivate::ReadingHeaderState) + firstRequestReader->readHeader(socket.data()); + else if (firstRequestReader->state == ReplyPrivate::ReadingDataState) + firstRequestReader->readBodyFast(socket.data(), &firstRequestReader->responseData); + + switch (firstRequestReader->state) { + case ReplyPrivate::ReadingHeaderState: + return; + case ReplyPrivate::ReadingDataState: + if (requestType == QHttpNetworkRequest::Post) + return; + break; + case ReplyPrivate::AllDoneState: + break; + default: + socket->close(); + return; + } + + if (!verifyProtocolUpgradeRequest() || !sendProtocolSwitchReply()) { + socket->close(); + return; + } + + upgradeProtocol = false; + protocolUpgradeHandler.reset(nullptr); + + if (testingGOAWAY) + return triggerGOAWAYEmulation(); + + // HTTP/1.1 'fields' we have in firstRequestRead are useless (they are not + // even allowed in HTTP/2 header). Let's pretend we have received + // valid HTTP/2 headers and can extract fields we need: + HttpHeader h2header; + h2header.push_back(HeaderField(":scheme", "http")); // we are in clearTextHTTP2 mode. + h2header.push_back(HeaderField(":authority", authority)); + activeRequests[1] = std::move(h2header); + // After protocol switch we immediately send our SETTINGS. + sendServerSettings(); + if (requestType == QHttpNetworkRequest::Get) + emit receivedRequest(1); + else + emit receivedData(1); +} + void Http2Server::handleConnectionPreface() { Q_ASSERT(waitingClientPreface); @@ -382,6 +539,16 @@ void Http2Server::handleIncomingFrame() // 7. RST_STREAM // 8. GOAWAY + if (testingGOAWAY) { + // GOAWAY test is simplistic for now: after HTTP/2 was + // negotiated (via ALPN/NPN or a protocol switch), send + // a GOAWAY frame after some (probably non-zero) timeout. + // We do not handle any frames, but timeout gives QNAM + // more time to initiate more streams and thus make the + // test more interesting/complex (on a client side). + return; + } + inboundFrame = std::move(reader.inboundFrame()); if (continuedRequest.size()) { diff --git a/tests/auto/network/access/http2/http2srv.h b/tests/auto/network/access/http2/http2srv.h index 63a4a4c8e9..10d0e86736 100644 --- a/tests/auto/network/access/http2/http2srv.h +++ b/tests/auto/network/access/http2/http2srv.h @@ -29,11 +29,14 @@ #ifndef HTTP2SRV_H #define HTTP2SRV_H +#include <QtNetwork/private/qhttpnetworkrequest_p.h> +#include <QtNetwork/private/qhttpnetworkreply_p.h> #include <QtNetwork/private/http2protocol_p.h> #include <QtNetwork/private/http2frames_p.h> #include <QtNetwork/private/hpack_p.h> #include <QtNetwork/qabstractsocket.h> +#include <QtCore/qsharedpointer.h> #include <QtCore/qscopedpointer.h> #include <QtNetwork/qtcpserver.h> #include <QtCore/qbytearray.h> @@ -58,6 +61,19 @@ struct Http2Setting using Http2Settings = std::vector<Http2Setting>; +// At the moment we do not have any public API parsing HTTP headers. Even worse - +// the code that can do this exists only in QHttpNetworkReplyPrivate class. +// To be able to access reply's d_func() we have these classes: +class Http11ReplyPrivate : public QHttpNetworkReplyPrivate +{ +}; + +class Http11Reply : public QHttpNetworkReply +{ +public: + Q_DECLARE_PRIVATE(Http11Reply) +}; + class Http2Server : public QTcpServer { Q_OBJECT @@ -75,6 +91,7 @@ public: // Invokables, since we can call them from the main thread, // but server (can) work on its own thread. Q_INVOKABLE void startServer(); + bool sendProtocolSwitchReply(); Q_INVOKABLE void sendServerSettings(); Q_INVOKABLE void sendGOAWAY(quint32 streamID, quint32 error, quint32 lastStreamID); @@ -82,6 +99,7 @@ public: Q_INVOKABLE void sendDATA(quint32 streamID, quint32 windowSize); Q_INVOKABLE void sendWINDOW_UPDATE(quint32 streamID, quint32 delta); + Q_INVOKABLE void handleProtocolUpgrade(); Q_INVOKABLE void handleConnectionPreface(); Q_INVOKABLE void handleIncomingFrame(); Q_INVOKABLE void handleSETTINGS(); @@ -114,6 +132,9 @@ private: void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE; quint32 clientSetting(Http2::Settings identifier, quint32 defaultValue); + bool readMethodLine(); + bool verifyProtocolUpgradeRequest(); + void triggerGOAWAYEmulation(); QScopedPointer<QAbstractSocket> socket; @@ -166,6 +187,18 @@ private: bool testingGOAWAY = false; int goawayTimeout = 0; + // Clear text HTTP/2, we have to deal with the protocol upgrade request + // from the initial HTTP/1.1 request. + bool upgradeProtocol = false; + QByteArray requestLine; + QHttpNetworkRequest::Operation requestType; + // We need QHttpNetworkReply (actually its private d-object) to handle the + // first HTTP/1.1 request. QHttpNetworkReplyPrivate does parsing + in case + // of POST it is also reading the body for us. + QScopedPointer<Http11Reply> protocolUpgradeHandler; + // We need it for PUSH_PROMISE, with the correct port number appended, + // when replying to essentially 1.1 request. + QByteArray authority; protected slots: void ignoreErrorSlot(); }; diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index d7a57f5e26..e433293a2c 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -47,10 +47,12 @@ #include <cstdlib> #include <string> -// At the moment our HTTP/2 imlpementation requires ALPN and this means OpenSSL. #if !defined(QT_NO_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_TLSEXT) +// HTTP/2 over TLS requires ALPN/NPN to negotiate the protocol version. const bool clearTextHTTP2 = false; #else +// No ALPN/NPN support to negotiate HTTP/2, we'll use cleartext 'h2c' with +// a protocol upgrade procedure. const bool clearTextHTTP2 = true; #endif @@ -507,6 +509,7 @@ void tst_Http2::sendRequest(int streamNumber, QNetworkRequest request(url); request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, QVariant(true)); + request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain")); request.setPriority(priority); QNetworkReply *reply = nullptr; diff --git a/tests/auto/network/ssl/qsslcertificate/pkcs12/README b/tests/auto/network/ssl/qsslcertificate/pkcs12/README index 1828d089c1..231567f586 100644 --- a/tests/auto/network/ssl/qsslcertificate/pkcs12/README +++ b/tests/auto/network/ssl/qsslcertificate/pkcs12/README @@ -1,8 +1,19 @@ -The PKCS#12 bundle was created by running the following on -in the qsslsocket/certs directory: +The PKCS#12 bundle was created by running the following in an +interactive shell in ../../qsslsocket/certs/: -openssl pkcs12 -export -in leaf.crt -inkey leaf.key \ - -out leaf.p12 \ +openssl pkcs12 -export -in leaf.crt \ + -inkey leaf.key -out leaf.p12 \ -certfile inter.crt -CAfile ca.crt -No password was provided. +An empty password was provided (twice). The pkcs.crt and pkcs.key +files were then copied here and leaf.p12 was moved here. + + +The test-case with no private key (in a valid PKCS12 file) was created +similarly but with the command adjusted to: + +openssl pkcs12 -export -in leaf.crt \ + -nokeys -out leaf-nokey.p12 \ + -certfile inter.crt -CAfile ca.crt + +The file leaf-nokey.p12 was then moved here. diff --git a/tests/auto/network/ssl/qsslcertificate/pkcs12/leaf-nokey.p12 b/tests/auto/network/ssl/qsslcertificate/pkcs12/leaf-nokey.p12 Binary files differnew file mode 100644 index 0000000000..032bf97b1b --- /dev/null +++ b/tests/auto/network/ssl/qsslcertificate/pkcs12/leaf-nokey.p12 diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index fced638ecb..064efc120b 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -1308,6 +1308,7 @@ void tst_QSslCertificate::version() void tst_QSslCertificate::pkcs12() { + // See pkcs12/README for how to generate the PKCS12 files used here. if (!QSslSocket::supportsSsl()) { qWarning("SSL not supported, skipping test"); return; @@ -1349,6 +1350,15 @@ void tst_QSslCertificate::pkcs12() QVERIFY(!caCerts.isEmpty()); QCOMPARE(caCerts.first(), caCert.first()); QCOMPARE(caCerts, caCert); + + // QTBUG-62335 - Fail (found no private key) but don't crash: + QFile nocert(testDataDir + QLatin1String("/pkcs12/leaf-nokey.p12")); + ok = nocert.open(QIODevice::ReadOnly); + QVERIFY(ok); + QTest::ignoreMessage(QtWarningMsg, "Unable to convert private key"); + ok = QSslCertificate::importPkcs12(&nocert, &key, &cert, &caCerts); + QVERIFY(!ok); + nocert.close(); } #endif // QT_NO_SSL diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 16bb0b7c3e..cc32e73b9c 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -39,6 +39,7 @@ #include <qpainter.h> #include <qprintengine.h> #include <qpagelayout.h> +#include <qsharedpointer.h> #include <qtemporarydir.h> #include <math.h> @@ -47,25 +48,15 @@ #include <windows.h> #endif +#if QT_CONFIG(printer) +typedef QSharedPointer<QPrinter> PrinterPtr; -QT_FORWARD_DECLARE_CLASS(QPrinter) +Q_DECLARE_METATYPE(PrinterPtr) +Q_DECLARE_METATYPE(QPrinter::Orientation) +Q_DECLARE_METATYPE(QPrinter::PageSize) +#endif // printer -// Helper class to make sure temp files are cleaned up after test complete -class TempFileCleanup -{ -public: - TempFileCleanup(const QString &file) - : m_file(file) - { - } - - ~TempFileCleanup() - { - QFile::remove(m_file); - } -private: - QString m_file; -}; +static int fileNumber = 0; class tst_QPrinter : public QObject { @@ -133,6 +124,9 @@ private slots: void testPageMetrics(); #endif private: + QString testFileName(const QString &prefix, const QString &suffix); + QString testPdfFileName(const QString &prefix) { return testFileName(prefix, QStringLiteral("pdf")); } + QTemporaryDir m_tempDir; }; @@ -202,72 +196,72 @@ void tst_QPrinter::testPrintPreviewDialog() void tst_QPrinter::testPageRectAndPaperRect_data() { - QTest::addColumn<int>("orientation"); + QTest::addColumn<PrinterPtr>("printer"); + QTest::addColumn<QPrinter::Orientation>("orientation"); QTest::addColumn<bool>("withPainter"); QTest::addColumn<int>("resolution"); QTest::addColumn<bool>("doPaperRect"); + const PrinterPtr printer(new QPrinter(QPrinter::HighResolution)); // paperrect - QTest::newRow("paperRect0") << int(QPrinter::Portrait) << true << 300 << true; - QTest::newRow("paperRect1") << int(QPrinter::Portrait) << false << 300 << true; - QTest::newRow("paperRect2") << int(QPrinter::Landscape) << true << 300 << true; - QTest::newRow("paperRect3") << int(QPrinter::Landscape) << false << 300 << true; - QTest::newRow("paperRect4") << int(QPrinter::Portrait) << true << 600 << true; - QTest::newRow("paperRect5") << int(QPrinter::Portrait) << false << 600 << true; - QTest::newRow("paperRect6") << int(QPrinter::Landscape) << true << 600 << true; - QTest::newRow("paperRect7") << int(QPrinter::Landscape) << false << 600 << true; - QTest::newRow("paperRect8") << int(QPrinter::Portrait) << true << 1200 << true; - QTest::newRow("paperRect9") << int(QPrinter::Portrait) << false << 1200 << true; - QTest::newRow("paperRect10") << int(QPrinter::Landscape) << true << 1200 << true; - QTest::newRow("paperRect11") << int(QPrinter::Landscape) << false << 1200 << true; + QTest::newRow("paperRect0") << printer << QPrinter::Portrait << true << 300 << true; + QTest::newRow("paperRect1") << printer << QPrinter::Portrait << false << 300 << true; + QTest::newRow("paperRect2") << printer << QPrinter::Landscape << true << 300 << true; + QTest::newRow("paperRect3") << printer << QPrinter::Landscape << false << 300 << true; + QTest::newRow("paperRect4") << printer << QPrinter::Portrait << true << 600 << true; + QTest::newRow("paperRect5") << printer << QPrinter::Portrait << false << 600 << true; + QTest::newRow("paperRect6") << printer << QPrinter::Landscape << true << 600 << true; + QTest::newRow("paperRect7") << printer << QPrinter::Landscape << false << 600 << true; + QTest::newRow("paperRect8") << printer << QPrinter::Portrait << true << 1200 << true; + QTest::newRow("paperRect9") << printer << QPrinter::Portrait << false << 1200 << true; + QTest::newRow("paperRect10") << printer << QPrinter::Landscape << true << 1200 << true; + QTest::newRow("paperRect11") << printer << QPrinter::Landscape << false << 1200 << true; // page rect - QTest::newRow("pageRect0") << int(QPrinter::Portrait) << true << 300 << false; - QTest::newRow("pageRect1") << int(QPrinter::Portrait) << false << 300 << false; - QTest::newRow("pageRect2") << int(QPrinter::Landscape) << true << 300 << false; - QTest::newRow("pageRect3") << int(QPrinter::Landscape) << false << 300 << false; - QTest::newRow("pageRect4") << int(QPrinter::Portrait) << true << 600 << false; - QTest::newRow("pageRect5") << int(QPrinter::Portrait) << false << 600 << false; - QTest::newRow("pageRect6") << int(QPrinter::Landscape) << true << 600 << false; - QTest::newRow("pageRect7") << int(QPrinter::Landscape) << false << 600 << false; - QTest::newRow("pageRect8") << int(QPrinter::Portrait) << true << 1200 << false; - QTest::newRow("pageRect9") << int(QPrinter::Portrait) << false << 1200 << false; - QTest::newRow("pageRect10") << int(QPrinter::Landscape) << true << 1200 << false; - QTest::newRow("pageRect11") << int(QPrinter::Landscape) << false << 1200 << false; + QTest::newRow("pageRect0") << printer << QPrinter::Portrait << true << 300 << false; + QTest::newRow("pageRect1") << printer << QPrinter::Portrait << false << 300 << false; + QTest::newRow("pageRect2") << printer << QPrinter::Landscape << true << 300 << false; + QTest::newRow("pageRect3") << printer << QPrinter::Landscape << false << 300 << false; + QTest::newRow("pageRect4") << printer << QPrinter::Portrait << true << 600 << false; + QTest::newRow("pageRect5") << printer << QPrinter::Portrait << false << 600 << false; + QTest::newRow("pageRect6") << printer << QPrinter::Landscape << true << 600 << false; + QTest::newRow("pageRect7") << printer << QPrinter::Landscape << false << 600 << false; + QTest::newRow("pageRect8") << printer << QPrinter::Portrait << true << 1200 << false; + QTest::newRow("pageRect9") << printer << QPrinter::Portrait << false << 1200 << false; + QTest::newRow("pageRect10") << printer << QPrinter::Landscape << true << 1200 << false; + QTest::newRow("pageRect11") << printer << QPrinter::Landscape << false << 1200 << false; } void tst_QPrinter::testPageRectAndPaperRect() { + QFETCH(PrinterPtr, printer); QFETCH(bool, withPainter); - QFETCH(int, orientation); + QFETCH(QPrinter::Orientation, orientation); QFETCH(int, resolution); QFETCH(bool, doPaperRect); QPainter *painter = 0; - QPrinter printer(QPrinter::HighResolution); - printer.setOrientation(QPrinter::Orientation(orientation)); - const QString fileName = m_tempDir.path() + QLatin1String("/silly"); - printer.setOutputFileName(fileName); - TempFileCleanup tmpFile(fileName); - - QRect pageRect = doPaperRect ? printer.paperRect() : printer.pageRect(); - float inchesX = float(pageRect.width()) / float(printer.resolution()); - float inchesY = float(pageRect.height()) / float(printer.resolution()); - printer.setResolution(resolution); + printer->setOrientation(orientation); + printer->setOutputFileName(testFileName(QLatin1String("silly"), QString())); + + QRect pageRect = doPaperRect ? printer->paperRect() : printer->pageRect(); + float inchesX = float(pageRect.width()) / float(printer->resolution()); + float inchesY = float(pageRect.height()) / float(printer->resolution()); + printer->setResolution(resolution); if (withPainter) - painter = new QPainter(&printer); + painter = new QPainter(printer.data()); - QRect otherRect = doPaperRect ? printer.paperRect() : printer.pageRect(); - float otherInchesX = float(otherRect.width()) / float(printer.resolution()); - float otherInchesY = float(otherRect.height()) / float(printer.resolution()); + QRect otherRect = doPaperRect ? printer->paperRect() : printer->pageRect(); + float otherInchesX = float(otherRect.width()) / float(printer->resolution()); + float otherInchesY = float(otherRect.height()) / float(printer->resolution()); if (painter != 0) delete painter; QVERIFY(qAbs(otherInchesX - inchesX) < 0.01); QVERIFY(qAbs(otherInchesY - inchesY) < 0.01); - QVERIFY(printer.orientation() == QPrinter::Portrait || pageRect.width() > pageRect.height()); - QVERIFY(printer.orientation() != QPrinter::Portrait || pageRect.width() < pageRect.height()); + QVERIFY(printer->orientation() == QPrinter::Portrait || pageRect.width() > pageRect.height()); + QVERIFY(printer->orientation() != QPrinter::Portrait || pageRect.width() < pageRect.height()); } void tst_QPrinter::testSetOptions() @@ -299,45 +293,40 @@ void tst_QPrinter::testSetOptions() void tst_QPrinter::testMargins_data() { - QTest::addColumn<int>("orientation"); + QTest::addColumn<PrinterPtr>("printer"); + QTest::addColumn<QPrinter::Orientation>("orientation"); QTest::addColumn<bool>("fullpage"); - QTest::addColumn<int>("pagesize"); - QTest::addColumn<int>("width"); - QTest::addColumn<int>("height"); + QTest::addColumn<QPrinter::PageSize>("pagesize"); QTest::addColumn<bool>("withPainter"); - QTest::newRow("data0") << int(QPrinter::Portrait) << true << int(QPrinter::A4) << 210 << 297 << false; - QTest::newRow("data1") << int(QPrinter::Landscape) << true << int(QPrinter::A4) << 297 << 210 << false; - QTest::newRow("data2") << int(QPrinter::Landscape) << false << int(QPrinter::A4) << 297 << 210 << false; - QTest::newRow("data3") << int(QPrinter::Portrait) << false << int(QPrinter::A4) << 210 << 297 << false; - QTest::newRow("data4") << int(QPrinter::Portrait) << true << int(QPrinter::A4) << 210 << 297 << true; - QTest::newRow("data5") << int(QPrinter::Landscape) << true << int(QPrinter::A4) << 297 << 210 << true; - QTest::newRow("data6") << int(QPrinter::Landscape) << false << int(QPrinter::A4) << 297 << 210 << true; - QTest::newRow("data7") << int(QPrinter::Portrait) << false << int(QPrinter::A4) << 210 << 297 << true; + const PrinterPtr printer(new QPrinter); + QTest::newRow("data0") << printer << QPrinter::Portrait << true << QPrinter::A4 << false; + QTest::newRow("data1") << printer << QPrinter::Landscape << true << QPrinter::A4 << false; + QTest::newRow("data2") << printer << QPrinter::Landscape << false << QPrinter::A4 << false; + QTest::newRow("data3") << printer << QPrinter::Portrait << false << QPrinter::A4 << false; + QTest::newRow("data4") << printer << QPrinter::Portrait << true << QPrinter::A4 << true; + QTest::newRow("data5") << printer << QPrinter::Landscape << true << QPrinter::A4 << true; + QTest::newRow("data6") << printer << QPrinter::Landscape << false << QPrinter::A4 << true; + QTest::newRow("data7") << printer << QPrinter::Portrait << false << QPrinter::A4 << true; } void tst_QPrinter::testMargins() { + QFETCH(PrinterPtr, printer); QFETCH(bool, withPainter); - QFETCH(int, orientation); - QFETCH(int, pagesize); - QFETCH(int, width); - QFETCH(int, height); + QFETCH(QPrinter::Orientation, orientation); + QFETCH(QPrinter::PageSize, pagesize); QFETCH(bool, fullpage); - Q_UNUSED(width); - Q_UNUSED(height); - QPrinter printer; QPainter *painter = 0; - printer.setOutputFileName("silly"); - printer.setOrientation((QPrinter::Orientation)orientation); - printer.setFullPage(fullpage); - printer.setPageSize((QPrinter::PageSize)pagesize); + printer->setOutputFileName(testFileName(QLatin1String("silly"), QString())); + printer->setOrientation(orientation); + printer->setFullPage(fullpage); + printer->setPageSize(pagesize); if (withPainter) - painter = new QPainter(&printer); + painter = new QPainter(printer.data()); if (painter) delete painter; - QFile::remove("silly"); } void tst_QPrinter::testMulitpleSets_data() @@ -420,9 +409,7 @@ void tst_QPrinter::outputFormatFromSuffix() QSKIP("No printers available."); QPrinter p; QCOMPARE(p.outputFormat(), QPrinter::NativeFormat); - const QString fileName = m_tempDir.path() + QLatin1String("/test.pdf"); - p.setOutputFileName(fileName); - TempFileCleanup tmpFile(fileName); + p.setOutputFileName(testPdfFileName(QLatin1String("test"))); QCOMPARE(p.outputFormat(), QPrinter::PdfFormat); p.setOutputFileName(QString()); QCOMPARE(p.outputFormat(), QPrinter::NativeFormat); @@ -510,9 +497,7 @@ void tst_QPrinter::errorReporting() p.setOutputFileName("/foobar/nonwritable.pdf"); QCOMPARE(painter.begin(&p), false); // it should check the output file is writable #endif - const QString fileName = m_tempDir.path() + QLatin1String("/test.pdf"); - p.setOutputFileName(fileName); - TempFileCleanup tmpFile(fileName); + p.setOutputFileName(testPdfFileName(QLatin1String("test"))); QCOMPARE(painter.begin(&p), true); // it should check the output QCOMPARE(p.isValid(), true); painter.end(); @@ -606,8 +591,7 @@ void tst_QPrinter::customPaperSizeAndMargins() void tst_QPrinter::printDialogCompleter() { QPrintDialog dialog; - dialog.printer()->setOutputFileName("file.pdf"); - TempFileCleanup tmpFile("file.pdf"); + dialog.printer()->setOutputFileName(testPdfFileName(QLatin1String("file"))); dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile); dialog.show(); @@ -627,10 +611,8 @@ static void printPage(QPainter *painter) void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles() { - const QString fileName1 = m_tempDir.path() + QLatin1String("/out1.pdf"); - const QString fileName2 = m_tempDir.path() + QLatin1String("/out2.pdf"); - TempFileCleanup tmpFile1(fileName1); - TempFileCleanup tmpFile2(fileName2); + const QString fileName1 = testPdfFileName(QLatin1String("out1_")); + const QString fileName2 = testPdfFileName(QLatin1String("out2_")); QPrinter printer; { @@ -689,7 +671,7 @@ void tst_QPrinter::testCurrentPage() void tst_QPrinter::testPdfTitle() { - const QString fileName = m_tempDir.path() + QLatin1String("/file.pdf"); + const QString fileName = testPdfFileName(QLatin1String("file")); // Check the document name is represented correctly in produced pdf { @@ -703,7 +685,6 @@ void tst_QPrinter::testPdfTitle() painter.begin(&printer); painter.end(); } - TempFileCleanup tmpFile(fileName); QFile file(fileName); QVERIFY(file.open(QIODevice::ReadOnly)); // The we expect the title to appear in the PDF as: @@ -1244,8 +1225,9 @@ void tst_QPrinter::outputFileName() QPrinter pdf; pdf.setOutputFormat(QPrinter::PdfFormat); QCOMPARE(pdf.outputFileName(), QString()); - pdf.setOutputFileName(QStringLiteral("Test File")); - QCOMPARE(pdf.outputFileName(), QString("Test File")); + const QString fileName = testFileName(QStringLiteral("Test File"), QString()); + pdf.setOutputFileName(fileName); + QCOMPARE(pdf.outputFileName(), fileName); QPrinter native; if (native.outputFormat() == QPrinter::NativeFormat) { @@ -1253,7 +1235,7 @@ void tst_QPrinter::outputFileName() QCOMPARE(native.outputFileName(), QString()); // Test set/get - QString expected = QStringLiteral("Test File"); + QString expected = fileName; native.setOutputFileName(expected); QCOMPARE(native.outputFileName(), expected); @@ -1960,6 +1942,15 @@ void tst_QPrinter::testPageMetrics() QCOMPARE(printer.pageRect(QPrinter::Millimeter), QRectF(leftMMf, topMMf, heightMMf - leftMMf - rightMMf, widthMMf - topMMf - bottomMMf)); } +QString tst_QPrinter::testFileName(const QString &prefix, const QString &suffix) +{ + QString result = m_tempDir.path() + QLatin1Char('/') + prefix + + QString::number(fileNumber++); + if (!suffix.isEmpty()) + result += QLatin1Char('.') + suffix; + return result; +} + #endif // QT_CONFIG(printer) QTEST_MAIN(tst_QPrinter) diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index c20fafe158..92a06cda00 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -136,7 +136,7 @@ QStringList tst_QPrinterInfo::getPrintersFromSystem() #ifdef Q_OS_UNIX // This function does roughly the same as the `command substitution` in // the shell. -QString tst_QPrinterInfo::getOutputFromCommand(const QStringList& command) +QString getOutputFromCommandInternal(const QStringList &command) { // The command execution does nothing on non-unix systems. int pid; @@ -194,6 +194,16 @@ QString tst_QPrinterInfo::getOutputFromCommand(const QStringList& command) return QString(array); } } + +QString tst_QPrinterInfo::getOutputFromCommand(const QStringList &command) +{ + // Forces the ouptut from the command to be in English + const QByteArray origSoftwareEnv = qgetenv("SOFTWARE"); + qputenv("SOFTWARE", QByteArray()); + QString output = getOutputFromCommandInternal(command); + qputenv("SOFTWARE", origSoftwareEnv); + return output; +} #endif // Windows test support not yet implemented diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp index c21223886a..5482dc393b 100644 --- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp @@ -177,7 +177,7 @@ public: for (int i = 0; i < ProdConIterations; ++i) { QVERIFY_SQL(q1, exec("select max(id) from " + qtest)); q1.first(); - q2.bindValue("id", q1.value(0)); + q2.bindValue(":id", q1.value(0)); q1.clear(); QVERIFY_SQL(q2, exec()); QThread::yieldCurrentThread(); diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index 97eb19599b..2cfe987f7d 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -33,6 +33,9 @@ #include <QtGui/QColor> #include <QtGui/QImage> #include <QtGui/QPixmap> +#include <QtGui/QVector2D> +#include <QtGui/QVector3D> +#include <QtGui/QVector4D> #endif /* XPM test data for QPixmap, QImage tests (use drag cursors as example) */ @@ -144,6 +147,9 @@ private slots: void compareQImages_data(); void compareQRegion_data(); void compareQRegion(); + void compareQVector2D(); + void compareQVector3D(); + void compareQVector4D(); #endif void verify(); void verify2(); @@ -454,6 +460,33 @@ void tst_Cmptest::compareQRegion() QCOMPARE(rA, rB); } + +void tst_Cmptest::compareQVector2D() +{ + QVector2D v2a{1, 2}; + QVector2D v2b = v2a; + QCOMPARE(v2a, v2b); + v2b.setY(3); + QCOMPARE(v2a, v2b); +} + +void tst_Cmptest::compareQVector3D() +{ + QVector3D v3a{1, 2, 3}; + QVector3D v3b = v3a; + QCOMPARE(v3a, v3b); + v3b.setY(3); + QCOMPARE(v3a, v3b); +} + +void tst_Cmptest::compareQVector4D() +{ + QVector4D v4a{1, 2, 3, 4}; + QVector4D v4b = v4a; + QCOMPARE(v4a, v4b); + v4b.setY(3); + QCOMPARE(v4a, v4b); +} #endif // QT_GUI_LIB static int opaqueFunc() diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index 621aceb887..eb11d236d4 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -223,6 +223,30 @@ </Incident> <Duration msecs="0"/> </TestFunction> +<TestFunction name="compareQVector2D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v2a): QVector2D(1, 2) + Expected (v2b): QVector2D(1, 3)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQVector3D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v3a): QVector3D(1, 2, 3) + Expected (v3b): QVector3D(1, 3, 3)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQVector4D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v4a): QVector4D(1, 2, 3, 4) + Expected (v4b): QVector4D(1, 3, 3, 4)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> <TestFunction name="verify"> <Incident type="fail" file="tst_cmptest.cpp" line="467"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> diff --git a/tests/auto/testlib/selftests/expected_cmptest.teamcity b/tests/auto/testlib/selftests/expected_cmptest.teamcity index f9cb5447d0..c49f5d6b79 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.teamcity +++ b/tests/auto/testlib/selftests/expected_cmptest.teamcity @@ -103,6 +103,15 @@ ##teamcity[testStarted name='compareQRegion(different lists)' flowId='tst_Cmptest'] ##teamcity[testFailed name='compareQRegion(different lists)' message='Failure! |[Loc: tst_cmptest.cpp(455)|]' details='Compared values are not the same|n Actual (rA): QRegion(200x50+10+10)|n Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQRegion(different lists)' flowId='tst_Cmptest'] +##teamcity[testStarted name='compareQVector2D()' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector2D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v2a): QVector2D(1, 2)|n Expected (v2b): QVector2D(1, 3)' flowId='tst_Cmptest'] +##teamcity[testFinished name='compareQVector2D()' flowId='tst_Cmptest'] +##teamcity[testStarted name='compareQVector3D()' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector3D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v3a): QVector3D(1, 2, 3)|n Expected (v3b): QVector3D(1, 3, 3)' flowId='tst_Cmptest'] +##teamcity[testFinished name='compareQVector3D()' flowId='tst_Cmptest'] +##teamcity[testStarted name='compareQVector4D()' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector4D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v4a): QVector4D(1, 2, 3, 4)|n Expected (v4b): QVector4D(1, 3, 3, 4)' flowId='tst_Cmptest'] +##teamcity[testFinished name='compareQVector4D()' flowId='tst_Cmptest'] ##teamcity[testStarted name='verify()' flowId='tst_Cmptest'] ##teamcity[testFailed name='verify()' message='Failure! |[Loc: tst_cmptest.cpp(467)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] ##teamcity[testFinished name='verify()' flowId='tst_Cmptest'] diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index 9c7f56e6c3..179136a2c7 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -111,6 +111,18 @@ FAIL! : tst_Cmptest::compareQRegion(different lists) Compared values are not th Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) Loc: [tst_cmptest.cpp(455)] +FAIL! : tst_Cmptest::compareQVector2D() Compared values are not the same + Actual (v2a): QVector2D(1, 2) + Expected (v2b): QVector2D(1, 3) + Loc: [tst_cmptest.cpp(0)] +FAIL! : tst_Cmptest::compareQVector3D() Compared values are not the same + Actual (v3a): QVector3D(1, 2, 3) + Expected (v3b): QVector3D(1, 3, 3) + Loc: [tst_cmptest.cpp(0)] +FAIL! : tst_Cmptest::compareQVector4D() Compared values are not the same + Actual (v4a): QVector4D(1, 2, 3, 4) + Expected (v4b): QVector4D(1, 3, 3, 4) + Loc: [tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::verify() 'opaqueFunc() < 2' returned FALSE. () Loc: [tst_cmptest.cpp(467)] FAIL! : tst_Cmptest::verify2() 'opaqueFunc() < 2' returned FALSE. (42) @@ -121,5 +133,5 @@ FAIL! : tst_Cmptest::tryVerify2() 'opaqueFunc() < 2' returned FALSE. (42) Loc: [tst_cmptest.cpp(485)] PASS : tst_Cmptest::verifyExplicitOperatorBool() PASS : tst_Cmptest::cleanupTestCase() -Totals: 15 passed, 30 failed, 0 skipped, 0 blacklisted, 244ms +Totals: 15 passed, 33 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index f64ffe3792..b281b04677 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -225,6 +225,30 @@ </Incident> <Duration msecs="0"/> </TestFunction> +<TestFunction name="compareQVector2D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v2a): QVector2D(1, 2) + Expected (v2b): QVector2D(1, 3)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQVector3D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v3a): QVector3D(1, 2, 3) + Expected (v3b): QVector3D(1, 3, 3)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQVector4D"> +<Incident type="fail" file="tst_cmptest.cpp" line="0"> + <Description><![CDATA[Compared values are not the same + Actual (v4a): QVector4D(1, 2, 3, 4) + Expected (v4b): QVector4D(1, 3, 3, 4)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> <TestFunction name="verify"> <Incident type="fail" file="tst_cmptest.cpp" line="467"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml index de47ac97f5..c2c0c86058 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="0" failures="30" tests="21" name="tst_Cmptest"> +<testsuite errors="0" failures="33" tests="24" name="tst_Cmptest"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -103,6 +103,21 @@ Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" result="fail"/> </testcase> + <testcase result="fail" name="compareQVector2D"> + <failure message="Compared values are not the same + Actual (v2a): QVector2D(1, 2) + Expected (v2b): QVector2D(1, 3)" result="fail"/> + </testcase> + <testcase result="fail" name="compareQVector3D"> + <failure message="Compared values are not the same + Actual (v3a): QVector3D(1, 2, 3) + Expected (v3b): QVector3D(1, 3, 3)" result="fail"/> + </testcase> + <testcase result="fail" name="compareQVector4D"> + <failure message="Compared values are not the same + Actual (v4a): QVector4D(1, 2, 3, 4) + Expected (v4b): QVector4D(1, 3, 3, 4)" result="fail"/> + </testcase> <testcase result="fail" name="verify"> <failure message="'opaqueFunc() < 2' returned FALSE. ()" result="fail"/> </testcase> diff --git a/tests/auto/tools/qmake/testdata/rawString/main.cpp b/tests/auto/tools/qmake/testdata/rawString/main.cpp index 53a28f7bc0..bc557f39f8 100644 --- a/tests/auto/tools/qmake/testdata/rawString/main.cpp +++ b/tests/auto/tools/qmake/testdata/rawString/main.cpp @@ -26,8 +26,107 @@ ** ****************************************************************************/ +// macro names that *aren't* string-literal-prefixes: +#define Ru8 "rue-it" +#define RL "real life" +#define Ru "are you ?" +#define RU "Are You ?" +#define LLR "double-hockey-sticks" +#define LUR "Tricky" +#define LuR "tricky" +#define Lu8R "l'uber" +#define UUR "Double-Yew" +#define ULR "Eweler" +#define UuR "You ... you-are" +#define Uu8R "You ... you *ate* our ..." +#define uuR "water" +#define uLR "eweler" +#define uUR "double-Your" +#define uu8R "totally uber" +#define u8u8R "rubber-you" +#define u8LR "Uber left-to-right" +#define u8UR "Uber Upper-Right" +#define u8uR "Uber upper-right" +#define Ru8R "bouncy" +#define RLR "Marching" +#define RuR "Rossum's general-purpose workers" +#define RUR "Rossum's Universal Robots" + +static const char monstrosity[] = + Ru8"Ru8(" + RL"RL(" + Ru"Ru(" + RU"RU(" + LLR"LLR(" + LUR"LUR(" + LuR"LuR(" + Lu8R"Lu8R(" + UUR"UUR(" + ULR"ULR(" + UuR"UuR(" + Uu8R"Uu8R(" + uuR"uuR(" + uLR"uLR(" + uUR"uUR(" + uu8R"uu8R(" + u8u8R"u8u8R(" + u8LR"u8LR(" + u8UR"u8UR(" + u8uR"u8uR(" + Ru8R"Ru8R(" + RLR"RLR(" + RuR"RuR(" + RUR"RUR(" + "Finally, some content"; + +#include <moc_object2.cpp> + +static const char closure[] = + ")RUR" + ")RuR" + ")RLR" + ")Ru8R" + ")u8uR" + ")u8UR" + ")u8LR" + ")u8u8R" + ")uu8R" + ")uUR" + ")uLR" + ")uuR" + ")Uu8R" + ")UuR" + ")ULR" + ")UUR" + ")Lu8R" + ")LuR" + ")LUR" + ")LLR" + ")RU" + ")Ru" + ")RL" + ")Ru8"; +// If moc got confused, the confusion should now be over + +// Real raw strings, not actually leaving us inside any comments: static const char raw[] = R"blah(lorem " ipsum /*)blah"\ ; +static const wchar_t wider[] = LR"blah(lorem " ipsum /*)blah"\ +; +static const char32_t UCS4[] = UR"blah(lorem " ipsum /*)blah"\ +; +static const char16_t UCS2[] = uR"blah(lorem " ipsum /*)blah"\ +; +static const char utf8[] = u8R"blah(lorem " ipsum /*)blah"\ +; #include <moc_object1.cpp> -int main () { return 0; } +/* Avoid unused variable warnings by silly uses of arrays: */ +#define final(x) x[sizeof(x) - 1] // 0, of course +int main () { + return final(raw) + * (final(wider) - final(UCS4)) + * (final(UCS2) - final(utf8)) + * (final(monstrosity) - final(closure)); +} +#undef final diff --git a/tests/auto/tools/qmake/testdata/rawString/object2.h b/tests/auto/tools/qmake/testdata/rawString/object2.h new file mode 100644 index 0000000000..2ab77cd3bd --- /dev/null +++ b/tests/auto/tools/qmake/testdata/rawString/object2.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef TEST_QMAKE_RAWSTRING_OBJECT2_H +#define TEST_QMAKE_RAWSTRING_OBJECT2_H + +#define Lu8UR "land" +inline char opener(int i) { + const char text[] = Lu8UR"blah( not a raw string; just juxtaposed"; + return text[i]; +} + +#include <QObject> + +class Object2 : public QObject +{ + Q_OBJECT +}; + +inline char closer(int i) { + const char text[] = "pretend to close it, all the same )blah"; + return text[i]; +} + +#endif // TEST_QMAKE_RAWSTRING_OBJECT2_H diff --git a/tests/auto/tools/qmake/testdata/rawString/rawString.pro b/tests/auto/tools/qmake/testdata/rawString/rawString.pro index d2d8132ceb..19c81dfe97 100644 --- a/tests/auto/tools/qmake/testdata/rawString/rawString.pro +++ b/tests/auto/tools/qmake/testdata/rawString/rawString.pro @@ -1,4 +1,4 @@ DESTDIR = ./ -HEADERS += object1.h +HEADERS += object1.h object2.h SOURCES += main.cpp diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h index f63995af24..81908b1eae 100644 --- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h +++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h @@ -44,7 +44,7 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h index 5cee346d35..55dfd6ba49 100644 --- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h +++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h @@ -44,7 +44,7 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h index 05330c9a2a..d1592b950c 100644 --- a/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h +++ b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h @@ -35,7 +35,7 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/Main_Window.ui.h b/tests/auto/tools/uic/baseline/Main_Window.ui.h index da2f4c8e07..7fc0781262 100644 --- a/tests/auto/tools/uic/baseline/Main_Window.ui.h +++ b/tests/auto/tools/uic/baseline/Main_Window.ui.h @@ -50,7 +50,7 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", Q_NULLPTR)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h index b812386645..4705159fea 100644 --- a/tests/auto/tools/uic/baseline/Widget.ui.h +++ b/tests/auto/tools/uic/baseline/Widget.ui.h @@ -60,13 +60,13 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Form", nullptr)); Alabel->setText(QApplication::translate("Form", "A label.\n" "One new line.\n" "Another new line.\n" -"Last line.", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("Form", "A Group Box", Q_NULLPTR)); - pushButton->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); +"Last line.", nullptr)); + groupBox->setTitle(QApplication::translate("Form", "A Group Box", nullptr)); + pushButton->setText(QApplication::translate("Form", "PushButton", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h index 9430d47c00..466f8660fd 100644 --- a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h +++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h @@ -100,9 +100,9 @@ public: void retranslateUi(QDialog *AddLinkDialog) { - AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", Q_NULLPTR)); - label->setText(QApplication::translate("AddLinkDialog", "Title:", Q_NULLPTR)); - label_2->setText(QApplication::translate("AddLinkDialog", "URL:", Q_NULLPTR)); + AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", nullptr)); + label->setText(QApplication::translate("AddLinkDialog", "Title:", nullptr)); + label_2->setText(QApplication::translate("AddLinkDialog", "URL:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h index 9d40907ad2..521a76847b 100644 --- a/tests/auto/tools/uic/baseline/addtorrentform.ui.h +++ b/tests/auto/tools/uic/baseline/addtorrentform.ui.h @@ -212,23 +212,23 @@ public: void retranslateUi(QDialog *AddTorrentFile) { - AddTorrentFile->setWindowTitle(QApplication::translate("AddTorrentFile", "Add a torrent", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("AddTorrentFile", "Select a torrent source", Q_NULLPTR)); - label_4->setText(QApplication::translate("AddTorrentFile", "Destination:", Q_NULLPTR)); - label_2->setText(QApplication::translate("AddTorrentFile", "Tracker URL:", Q_NULLPTR)); - browseTorrents->setText(QApplication::translate("AddTorrentFile", "Browse", Q_NULLPTR)); - label_5->setText(QApplication::translate("AddTorrentFile", "File(s):", Q_NULLPTR)); - label_3->setText(QApplication::translate("AddTorrentFile", "Size:", Q_NULLPTR)); - label_6->setText(QApplication::translate("AddTorrentFile", "Creator:", Q_NULLPTR)); - announceUrl->setText(QApplication::translate("AddTorrentFile", "<none>", Q_NULLPTR)); - label->setText(QApplication::translate("AddTorrentFile", "Torrent file:", Q_NULLPTR)); - browseDestination->setText(QApplication::translate("AddTorrentFile", "Browse", Q_NULLPTR)); - label_7->setText(QApplication::translate("AddTorrentFile", "Comment:", Q_NULLPTR)); - commentLabel->setText(QApplication::translate("AddTorrentFile", "<none>", Q_NULLPTR)); - creatorLabel->setText(QApplication::translate("AddTorrentFile", "<none>", Q_NULLPTR)); - sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", Q_NULLPTR)); - okButton->setText(QApplication::translate("AddTorrentFile", "&OK", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", Q_NULLPTR)); + AddTorrentFile->setWindowTitle(QApplication::translate("AddTorrentFile", "Add a torrent", nullptr)); + groupBox->setTitle(QApplication::translate("AddTorrentFile", "Select a torrent source", nullptr)); + label_4->setText(QApplication::translate("AddTorrentFile", "Destination:", nullptr)); + label_2->setText(QApplication::translate("AddTorrentFile", "Tracker URL:", nullptr)); + browseTorrents->setText(QApplication::translate("AddTorrentFile", "Browse", nullptr)); + label_5->setText(QApplication::translate("AddTorrentFile", "File(s):", nullptr)); + label_3->setText(QApplication::translate("AddTorrentFile", "Size:", nullptr)); + label_6->setText(QApplication::translate("AddTorrentFile", "Creator:", nullptr)); + announceUrl->setText(QApplication::translate("AddTorrentFile", "<none>", nullptr)); + label->setText(QApplication::translate("AddTorrentFile", "Torrent file:", nullptr)); + browseDestination->setText(QApplication::translate("AddTorrentFile", "Browse", nullptr)); + label_7->setText(QApplication::translate("AddTorrentFile", "Comment:", nullptr)); + commentLabel->setText(QApplication::translate("AddTorrentFile", "<none>", nullptr)); + creatorLabel->setText(QApplication::translate("AddTorrentFile", "<none>", nullptr)); + sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", nullptr)); + okButton->setText(QApplication::translate("AddTorrentFile", "&OK", nullptr)); + cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h index fbc379a1c1..2c760be6c8 100644 --- a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h +++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h @@ -106,12 +106,12 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Http authentication required", Q_NULLPTR)); - label->setText(QApplication::translate("Dialog", "You need to supply a Username and a Password to access this site", Q_NULLPTR)); - label_2->setText(QApplication::translate("Dialog", "Username:", Q_NULLPTR)); - label_3->setText(QApplication::translate("Dialog", "Password:", Q_NULLPTR)); - label_4->setText(QApplication::translate("Dialog", "Site:", Q_NULLPTR)); - siteDescription->setText(QApplication::translate("Dialog", "%1 at %2", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Http authentication required", nullptr)); + label->setText(QApplication::translate("Dialog", "You need to supply a Username and a Password to access this site", nullptr)); + label_2->setText(QApplication::translate("Dialog", "Username:", nullptr)); + label_3->setText(QApplication::translate("Dialog", "Password:", nullptr)); + label_4->setText(QApplication::translate("Dialog", "Site:", nullptr)); + siteDescription->setText(QApplication::translate("Dialog", "%1 at %2", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/backside.ui.h b/tests/auto/tools/uic/baseline/backside.ui.h index abbf331182..c78b474277 100644 --- a/tests/auto/tools/uic/baseline/backside.ui.h +++ b/tests/auto/tools/uic/baseline/backside.ui.h @@ -146,40 +146,40 @@ public: void retranslateUi(QWidget *BackSide) { - BackSide->setWindowTitle(QApplication::translate("BackSide", "BackSide", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("BackSide", "Settings", Q_NULLPTR)); - label->setText(QApplication::translate("BackSide", "Title:", Q_NULLPTR)); - hostName->setText(QApplication::translate("BackSide", "Pad Navigator Example", Q_NULLPTR)); - label_2->setText(QApplication::translate("BackSide", "Modified:", Q_NULLPTR)); - label_3->setText(QApplication::translate("BackSide", "Extent", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("BackSide", "Other input", Q_NULLPTR)); + BackSide->setWindowTitle(QApplication::translate("BackSide", "BackSide", nullptr)); + groupBox->setTitle(QApplication::translate("BackSide", "Settings", nullptr)); + label->setText(QApplication::translate("BackSide", "Title:", nullptr)); + hostName->setText(QApplication::translate("BackSide", "Pad Navigator Example", nullptr)); + label_2->setText(QApplication::translate("BackSide", "Modified:", nullptr)); + label_3->setText(QApplication::translate("BackSide", "Extent", nullptr)); + groupBox_2->setTitle(QApplication::translate("BackSide", "Other input", nullptr)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("BackSide", "Widgets On Graphics View", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("BackSide", "Widgets On Graphics View", nullptr)); const bool __sortingEnabled = treeWidget->isSortingEnabled(); treeWidget->setSortingEnabled(false); QTreeWidgetItem *___qtreewidgetitem1 = treeWidget->topLevelItem(0); - ___qtreewidgetitem1->setText(0, QApplication::translate("BackSide", "QGraphicsProxyWidget", Q_NULLPTR)); + ___qtreewidgetitem1->setText(0, QApplication::translate("BackSide", "QGraphicsProxyWidget", nullptr)); QTreeWidgetItem *___qtreewidgetitem2 = ___qtreewidgetitem1->child(0); - ___qtreewidgetitem2->setText(0, QApplication::translate("BackSide", "QGraphicsWidget", Q_NULLPTR)); + ___qtreewidgetitem2->setText(0, QApplication::translate("BackSide", "QGraphicsWidget", nullptr)); QTreeWidgetItem *___qtreewidgetitem3 = ___qtreewidgetitem2->child(0); - ___qtreewidgetitem3->setText(0, QApplication::translate("BackSide", "QObject", Q_NULLPTR)); + ___qtreewidgetitem3->setText(0, QApplication::translate("BackSide", "QObject", nullptr)); QTreeWidgetItem *___qtreewidgetitem4 = ___qtreewidgetitem2->child(1); - ___qtreewidgetitem4->setText(0, QApplication::translate("BackSide", "QGraphicsItem", Q_NULLPTR)); + ___qtreewidgetitem4->setText(0, QApplication::translate("BackSide", "QGraphicsItem", nullptr)); QTreeWidgetItem *___qtreewidgetitem5 = ___qtreewidgetitem2->child(2); - ___qtreewidgetitem5->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_NULLPTR)); + ___qtreewidgetitem5->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", nullptr)); QTreeWidgetItem *___qtreewidgetitem6 = treeWidget->topLevelItem(1); - ___qtreewidgetitem6->setText(0, QApplication::translate("BackSide", "QGraphicsGridLayout", Q_NULLPTR)); + ___qtreewidgetitem6->setText(0, QApplication::translate("BackSide", "QGraphicsGridLayout", nullptr)); QTreeWidgetItem *___qtreewidgetitem7 = ___qtreewidgetitem6->child(0); - ___qtreewidgetitem7->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", Q_NULLPTR)); + ___qtreewidgetitem7->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", nullptr)); QTreeWidgetItem *___qtreewidgetitem8 = ___qtreewidgetitem7->child(0); - ___qtreewidgetitem8->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_NULLPTR)); + ___qtreewidgetitem8->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", nullptr)); QTreeWidgetItem *___qtreewidgetitem9 = treeWidget->topLevelItem(2); - ___qtreewidgetitem9->setText(0, QApplication::translate("BackSide", "QGraphicsLinearLayout", Q_NULLPTR)); + ___qtreewidgetitem9->setText(0, QApplication::translate("BackSide", "QGraphicsLinearLayout", nullptr)); QTreeWidgetItem *___qtreewidgetitem10 = ___qtreewidgetitem9->child(0); - ___qtreewidgetitem10->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", Q_NULLPTR)); + ___qtreewidgetitem10->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", nullptr)); QTreeWidgetItem *___qtreewidgetitem11 = ___qtreewidgetitem10->child(0); - ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_NULLPTR)); + ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", nullptr)); treeWidget->setSortingEnabled(__sortingEnabled); } // retranslateUi diff --git a/tests/auto/tools/uic/baseline/batchtranslation.ui.h b/tests/auto/tools/uic/baseline/batchtranslation.ui.h index 87c140deff..53fc9052b2 100644 --- a/tests/auto/tools/uic/baseline/batchtranslation.ui.h +++ b/tests/auto/tools/uic/baseline/batchtranslation.ui.h @@ -216,16 +216,16 @@ public: void retranslateUi(QDialog *databaseTranslationDialog) { - databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", Q_NULLPTR)); - ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", Q_NULLPTR)); - ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", Q_NULLPTR)); - moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", Q_NULLPTR)); - moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", Q_NULLPTR)); - label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", Q_NULLPTR)); - runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", Q_NULLPTR)); + databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", nullptr)); + groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", nullptr)); + ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", nullptr)); + ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", nullptr)); + groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", nullptr)); + moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", nullptr)); + moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", nullptr)); + label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", nullptr)); + runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", nullptr)); + cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h index 6e62aeaec5..f5ec343a89 100644 --- a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h +++ b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h @@ -150,13 +150,13 @@ public: void retranslateUi(QDialog *BookmarkDialog) { - BookmarkDialog->setWindowTitle(QApplication::translate("BookmarkDialog", "Add Bookmark", Q_NULLPTR)); - label->setText(QApplication::translate("BookmarkDialog", "Bookmark:", Q_NULLPTR)); - label_2->setText(QApplication::translate("BookmarkDialog", "Add in Folder:", Q_NULLPTR)); - toolButton->setText(QApplication::translate("BookmarkDialog", "+", Q_NULLPTR)); + BookmarkDialog->setWindowTitle(QApplication::translate("BookmarkDialog", "Add Bookmark", nullptr)); + label->setText(QApplication::translate("BookmarkDialog", "Bookmark:", nullptr)); + label_2->setText(QApplication::translate("BookmarkDialog", "Add in Folder:", nullptr)); + toolButton->setText(QApplication::translate("BookmarkDialog", "+", nullptr)); QTreeWidgetItem *___qtreewidgetitem = bookmarkWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", Q_NULLPTR)); - newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", nullptr)); + newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bookwindow.ui.h b/tests/auto/tools/uic/baseline/bookwindow.ui.h index 57ac4b3bdd..daf441e5d9 100644 --- a/tests/auto/tools/uic/baseline/bookwindow.ui.h +++ b/tests/auto/tools/uic/baseline/bookwindow.ui.h @@ -159,15 +159,15 @@ public: void retranslateUi(QMainWindow *BookWindow) { - BookWindow->setWindowTitle(QApplication::translate("BookWindow", "Books", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("BookWindow", "Books", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("BookWindow", "Details", Q_NULLPTR)); - label_5->setText(QApplication::translate("BookWindow", "<b>Title:</b>", Q_NULLPTR)); - label_2_2_2_2->setText(QApplication::translate("BookWindow", "<b>Author: </b>", Q_NULLPTR)); - label_3->setText(QApplication::translate("BookWindow", "<b>Genre:</b>", Q_NULLPTR)); - label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", Q_NULLPTR)); + BookWindow->setWindowTitle(QApplication::translate("BookWindow", "Books", nullptr)); + groupBox->setTitle(QApplication::translate("BookWindow", "Books", nullptr)); + groupBox_2->setTitle(QApplication::translate("BookWindow", "Details", nullptr)); + label_5->setText(QApplication::translate("BookWindow", "<b>Title:</b>", nullptr)); + label_2_2_2_2->setText(QApplication::translate("BookWindow", "<b>Author: </b>", nullptr)); + label_3->setText(QApplication::translate("BookWindow", "<b>Genre:</b>", nullptr)); + label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", nullptr)); yearEdit->setPrefix(QString()); - label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", Q_NULLPTR)); + label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/browserwidget.ui.h b/tests/auto/tools/uic/baseline/browserwidget.ui.h index 876e99d504..e5bebd8f59 100644 --- a/tests/auto/tools/uic/baseline/browserwidget.ui.h +++ b/tests/auto/tools/uic/baseline/browserwidget.ui.h @@ -156,18 +156,18 @@ public: void retranslateUi(QWidget *Browser) { - Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", Q_NULLPTR)); - insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", Q_NULLPTR)); + Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", nullptr)); + insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", nullptr)); #ifndef QT_NO_STATUSTIP - insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", Q_NULLPTR)); + insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", nullptr)); #endif // QT_NO_STATUSTIP - deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", Q_NULLPTR)); + deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", nullptr)); #ifndef QT_NO_STATUSTIP - deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", Q_NULLPTR)); + deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", nullptr)); #endif // QT_NO_STATUSTIP - groupBox->setTitle(QApplication::translate("Browser", "SQL Query", Q_NULLPTR)); - clearButton->setText(QApplication::translate("Browser", "&Clear", Q_NULLPTR)); - submitButton->setText(QApplication::translate("Browser", "&Submit", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("Browser", "SQL Query", nullptr)); + clearButton->setText(QApplication::translate("Browser", "&Clear", nullptr)); + submitButton->setText(QApplication::translate("Browser", "&Submit", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h index d72ca81be6..caac7e31aa 100644 --- a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h +++ b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h @@ -59,9 +59,9 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("Dialog", "4", Q_NULLPTR)); + ___qtreewidgetitem->setText(1, QApplication::translate("Dialog", "4", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h index 88644eaaaf..5c8b8640d3 100644 --- a/tests/auto/tools/uic/baseline/calculator.ui.h +++ b/tests/auto/tools/uic/baseline/calculator.ui.h @@ -159,34 +159,34 @@ public: void retranslateUi(QWidget *Calculator) { - Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", Q_NULLPTR)); - backspaceButton->setText(QApplication::translate("Calculator", "Backspace", Q_NULLPTR)); - clearButton->setText(QApplication::translate("Calculator", "Clear", Q_NULLPTR)); - clearAllButton->setText(QApplication::translate("Calculator", "Clear All", Q_NULLPTR)); - clearMemoryButton->setText(QApplication::translate("Calculator", "MC", Q_NULLPTR)); - readMemoryButton->setText(QApplication::translate("Calculator", "MR", Q_NULLPTR)); - setMemoryButton->setText(QApplication::translate("Calculator", "MS", Q_NULLPTR)); - addToMemoryButton->setText(QApplication::translate("Calculator", "M+", Q_NULLPTR)); - sevenButton->setText(QApplication::translate("Calculator", "7", Q_NULLPTR)); - eightButton->setText(QApplication::translate("Calculator", "8", Q_NULLPTR)); - nineButton->setText(QApplication::translate("Calculator", "9", Q_NULLPTR)); - fourButton->setText(QApplication::translate("Calculator", "4", Q_NULLPTR)); - fiveButton->setText(QApplication::translate("Calculator", "5", Q_NULLPTR)); - sixButton->setText(QApplication::translate("Calculator", "6", Q_NULLPTR)); - oneButton->setText(QApplication::translate("Calculator", "1", Q_NULLPTR)); - twoButton->setText(QApplication::translate("Calculator", "2", Q_NULLPTR)); - threeButton->setText(QApplication::translate("Calculator", "3", Q_NULLPTR)); - zeroButton->setText(QApplication::translate("Calculator", "0", Q_NULLPTR)); - pointButton->setText(QApplication::translate("Calculator", ".", Q_NULLPTR)); - changeSignButton->setText(QApplication::translate("Calculator", "+-", Q_NULLPTR)); - plusButton->setText(QApplication::translate("Calculator", "+", Q_NULLPTR)); - divisionButton->setText(QApplication::translate("Calculator", "/", Q_NULLPTR)); - timesButton->setText(QApplication::translate("Calculator", "*", Q_NULLPTR)); - minusButton->setText(QApplication::translate("Calculator", "-", Q_NULLPTR)); - squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", Q_NULLPTR)); - powerButton->setText(QApplication::translate("Calculator", "x^2", Q_NULLPTR)); - reciprocalButton->setText(QApplication::translate("Calculator", "1/x", Q_NULLPTR)); - equalButton->setText(QApplication::translate("Calculator", "=", Q_NULLPTR)); + Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", nullptr)); + backspaceButton->setText(QApplication::translate("Calculator", "Backspace", nullptr)); + clearButton->setText(QApplication::translate("Calculator", "Clear", nullptr)); + clearAllButton->setText(QApplication::translate("Calculator", "Clear All", nullptr)); + clearMemoryButton->setText(QApplication::translate("Calculator", "MC", nullptr)); + readMemoryButton->setText(QApplication::translate("Calculator", "MR", nullptr)); + setMemoryButton->setText(QApplication::translate("Calculator", "MS", nullptr)); + addToMemoryButton->setText(QApplication::translate("Calculator", "M+", nullptr)); + sevenButton->setText(QApplication::translate("Calculator", "7", nullptr)); + eightButton->setText(QApplication::translate("Calculator", "8", nullptr)); + nineButton->setText(QApplication::translate("Calculator", "9", nullptr)); + fourButton->setText(QApplication::translate("Calculator", "4", nullptr)); + fiveButton->setText(QApplication::translate("Calculator", "5", nullptr)); + sixButton->setText(QApplication::translate("Calculator", "6", nullptr)); + oneButton->setText(QApplication::translate("Calculator", "1", nullptr)); + twoButton->setText(QApplication::translate("Calculator", "2", nullptr)); + threeButton->setText(QApplication::translate("Calculator", "3", nullptr)); + zeroButton->setText(QApplication::translate("Calculator", "0", nullptr)); + pointButton->setText(QApplication::translate("Calculator", ".", nullptr)); + changeSignButton->setText(QApplication::translate("Calculator", "+-", nullptr)); + plusButton->setText(QApplication::translate("Calculator", "+", nullptr)); + divisionButton->setText(QApplication::translate("Calculator", "/", nullptr)); + timesButton->setText(QApplication::translate("Calculator", "*", nullptr)); + minusButton->setText(QApplication::translate("Calculator", "-", nullptr)); + squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", nullptr)); + powerButton->setText(QApplication::translate("Calculator", "x^2", nullptr)); + reciprocalButton->setText(QApplication::translate("Calculator", "1/x", nullptr)); + equalButton->setText(QApplication::translate("Calculator", "=", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/calculatorform.ui.h b/tests/auto/tools/uic/baseline/calculatorform.ui.h index 3688c79d04..86482c7814 100644 --- a/tests/auto/tools/uic/baseline/calculatorform.ui.h +++ b/tests/auto/tools/uic/baseline/calculatorform.ui.h @@ -173,13 +173,13 @@ public: void retranslateUi(QWidget *CalculatorForm) { - CalculatorForm->setWindowTitle(QApplication::translate("CalculatorForm", "Calculator Builder", Q_NULLPTR)); - label->setText(QApplication::translate("CalculatorForm", "Input 1", Q_NULLPTR)); - label_3->setText(QApplication::translate("CalculatorForm", "+", Q_NULLPTR)); - label_2->setText(QApplication::translate("CalculatorForm", "Input 2", Q_NULLPTR)); - label_3_2->setText(QApplication::translate("CalculatorForm", "=", Q_NULLPTR)); - label_2_2_2->setText(QApplication::translate("CalculatorForm", "Output", Q_NULLPTR)); - outputWidget->setText(QApplication::translate("CalculatorForm", "0", Q_NULLPTR)); + CalculatorForm->setWindowTitle(QApplication::translate("CalculatorForm", "Calculator Builder", nullptr)); + label->setText(QApplication::translate("CalculatorForm", "Input 1", nullptr)); + label_3->setText(QApplication::translate("CalculatorForm", "+", nullptr)); + label_2->setText(QApplication::translate("CalculatorForm", "Input 2", nullptr)); + label_3_2->setText(QApplication::translate("CalculatorForm", "=", nullptr)); + label_2_2_2->setText(QApplication::translate("CalculatorForm", "Output", nullptr)); + outputWidget->setText(QApplication::translate("CalculatorForm", "0", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h index 183b89aaff..ac31a209e2 100644 --- a/tests/auto/tools/uic/baseline/certificateinfo.ui.h +++ b/tests/auto/tools/uic/baseline/certificateinfo.ui.h @@ -93,9 +93,9 @@ public: void retranslateUi(QDialog *CertificateInfo) { - CertificateInfo->setWindowTitle(QApplication::translate("CertificateInfo", "Display Certificate Information", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("CertificateInfo", "Certification Path", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("CertificateInfo", "Certificate Information", Q_NULLPTR)); + CertificateInfo->setWindowTitle(QApplication::translate("CertificateInfo", "Display Certificate Information", nullptr)); + groupBox->setTitle(QApplication::translate("CertificateInfo", "Certification Path", nullptr)); + groupBox_2->setTitle(QApplication::translate("CertificateInfo", "Certificate Information", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatdialog.ui.h b/tests/auto/tools/uic/baseline/chatdialog.ui.h index b678b85eb9..48c6e2d3a1 100644 --- a/tests/auto/tools/uic/baseline/chatdialog.ui.h +++ b/tests/auto/tools/uic/baseline/chatdialog.ui.h @@ -100,8 +100,8 @@ public: void retranslateUi(QDialog *ChatDialog) { - ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", Q_NULLPTR)); - label->setText(QApplication::translate("ChatDialog", "Message:", Q_NULLPTR)); + ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", nullptr)); + label->setText(QApplication::translate("ChatDialog", "Message:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index 7f8b026ba5..2764761023 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -149,29 +149,29 @@ public: void retranslateUi(QMainWindow *ChatMainWindow) { - ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", Q_NULLPTR)); - actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", Q_NULLPTR)); + ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", nullptr)); + actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", nullptr)); #ifndef QT_NO_SHORTCUT - actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", Q_NULLPTR)); + actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", nullptr)); #endif // QT_NO_SHORTCUT - actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", Q_NULLPTR)); - actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", Q_NULLPTR)); + actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", nullptr)); + actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", nullptr)); #ifndef QT_NO_SHORTCUT - actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", Q_NULLPTR)); + actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", nullptr)); #endif // QT_NO_SHORTCUT #ifndef QT_NO_TOOLTIP - chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", Q_NULLPTR)); + chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", nullptr)); #endif // QT_NO_TOOLTIP - label->setText(QApplication::translate("ChatMainWindow", "Message:", Q_NULLPTR)); + label->setText(QApplication::translate("ChatMainWindow", "Message:", nullptr)); #ifndef QT_NO_TOOLTIP - sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", Q_NULLPTR)); + sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS sendButton->setWhatsThis(QString()); #endif // QT_NO_WHATSTHIS - sendButton->setText(QApplication::translate("ChatMainWindow", "Send", Q_NULLPTR)); - menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", Q_NULLPTR)); - menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", Q_NULLPTR)); + sendButton->setText(QApplication::translate("ChatMainWindow", "Send", nullptr)); + menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", nullptr)); + menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h index aa023a56fb..0fc8d99ab3 100644 --- a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h +++ b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h @@ -115,10 +115,10 @@ public: void retranslateUi(QDialog *NicknameDialog) { - NicknameDialog->setWindowTitle(QApplication::translate("NicknameDialog", "Set nickname", Q_NULLPTR)); - label->setText(QApplication::translate("NicknameDialog", "New nickname:", Q_NULLPTR)); - okButton->setText(QApplication::translate("NicknameDialog", "OK", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("NicknameDialog", "Cancel", Q_NULLPTR)); + NicknameDialog->setWindowTitle(QApplication::translate("NicknameDialog", "Set nickname", nullptr)); + label->setText(QApplication::translate("NicknameDialog", "New nickname:", nullptr)); + okButton->setText(QApplication::translate("NicknameDialog", "OK", nullptr)); + cancelButton->setText(QApplication::translate("NicknameDialog", "Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h index 002eababb9..d0c4c95e72 100644 --- a/tests/auto/tools/uic/baseline/config.ui.h +++ b/tests/auto/tools/uic/baseline/config.ui.h @@ -709,44 +709,44 @@ public: void retranslateUi(QDialog *Config) { - Config->setWindowTitle(QApplication::translate("Config", "Configure", Q_NULLPTR)); - ButtonGroup1->setTitle(QApplication::translate("Config", "Size", Q_NULLPTR)); - size_176_220->setText(QApplication::translate("Config", "176x220 \"SmartPhone\"", Q_NULLPTR)); - size_240_320->setText(QApplication::translate("Config", "240x320 \"PDA\"", Q_NULLPTR)); - size_320_240->setText(QApplication::translate("Config", "320x240 \"TV\" / \"QVGA\"", Q_NULLPTR)); - size_640_480->setText(QApplication::translate("Config", "640x480 \"VGA\"", Q_NULLPTR)); - size_800_600->setText(QApplication::translate("Config", "800x600", Q_NULLPTR)); - size_1024_768->setText(QApplication::translate("Config", "1024x768", Q_NULLPTR)); - size_custom->setText(QApplication::translate("Config", "Custom", Q_NULLPTR)); - ButtonGroup2->setTitle(QApplication::translate("Config", "Depth", Q_NULLPTR)); - depth_1->setText(QApplication::translate("Config", "1 bit monochrome", Q_NULLPTR)); - depth_4gray->setText(QApplication::translate("Config", "4 bit grayscale", Q_NULLPTR)); - depth_8->setText(QApplication::translate("Config", "8 bit", Q_NULLPTR)); - depth_12->setText(QApplication::translate("Config", "12 (16) bit", Q_NULLPTR)); - depth_15->setText(QApplication::translate("Config", "15 bit", Q_NULLPTR)); - depth_16->setText(QApplication::translate("Config", "16 bit", Q_NULLPTR)); - depth_18->setText(QApplication::translate("Config", "18 bit", Q_NULLPTR)); - depth_24->setText(QApplication::translate("Config", "24 bit", Q_NULLPTR)); - depth_32->setText(QApplication::translate("Config", "32 bit", Q_NULLPTR)); - depth_32_argb->setText(QApplication::translate("Config", "32 bit ARGB", Q_NULLPTR)); - TextLabel1_3->setText(QApplication::translate("Config", "Skin", Q_NULLPTR)); - skin->setItemText(0, QApplication::translate("Config", "None", Q_NULLPTR)); - - touchScreen->setText(QApplication::translate("Config", "Emulate touch screen (no mouse move)", Q_NULLPTR)); - lcdScreen->setText(QApplication::translate("Config", "Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)", Q_NULLPTR)); - TextLabel1->setText(QApplication::translate("Config", "<p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>.", Q_NULLPTR)); - GroupBox1->setTitle(QApplication::translate("Config", "Gamma", Q_NULLPTR)); - TextLabel3->setText(QApplication::translate("Config", "Blue", Q_NULLPTR)); - blabel->setText(QApplication::translate("Config", "1.0", Q_NULLPTR)); - TextLabel2->setText(QApplication::translate("Config", "Green", Q_NULLPTR)); - glabel->setText(QApplication::translate("Config", "1.0", Q_NULLPTR)); - TextLabel7->setText(QApplication::translate("Config", "All", Q_NULLPTR)); - TextLabel8->setText(QApplication::translate("Config", "1.0", Q_NULLPTR)); - TextLabel1_2->setText(QApplication::translate("Config", "Red", Q_NULLPTR)); - rlabel->setText(QApplication::translate("Config", "1.0", Q_NULLPTR)); - PushButton3->setText(QApplication::translate("Config", "Set all to 1.0", Q_NULLPTR)); - buttonOk->setText(QApplication::translate("Config", "&OK", Q_NULLPTR)); - buttonCancel->setText(QApplication::translate("Config", "&Cancel", Q_NULLPTR)); + Config->setWindowTitle(QApplication::translate("Config", "Configure", nullptr)); + ButtonGroup1->setTitle(QApplication::translate("Config", "Size", nullptr)); + size_176_220->setText(QApplication::translate("Config", "176x220 \"SmartPhone\"", nullptr)); + size_240_320->setText(QApplication::translate("Config", "240x320 \"PDA\"", nullptr)); + size_320_240->setText(QApplication::translate("Config", "320x240 \"TV\" / \"QVGA\"", nullptr)); + size_640_480->setText(QApplication::translate("Config", "640x480 \"VGA\"", nullptr)); + size_800_600->setText(QApplication::translate("Config", "800x600", nullptr)); + size_1024_768->setText(QApplication::translate("Config", "1024x768", nullptr)); + size_custom->setText(QApplication::translate("Config", "Custom", nullptr)); + ButtonGroup2->setTitle(QApplication::translate("Config", "Depth", nullptr)); + depth_1->setText(QApplication::translate("Config", "1 bit monochrome", nullptr)); + depth_4gray->setText(QApplication::translate("Config", "4 bit grayscale", nullptr)); + depth_8->setText(QApplication::translate("Config", "8 bit", nullptr)); + depth_12->setText(QApplication::translate("Config", "12 (16) bit", nullptr)); + depth_15->setText(QApplication::translate("Config", "15 bit", nullptr)); + depth_16->setText(QApplication::translate("Config", "16 bit", nullptr)); + depth_18->setText(QApplication::translate("Config", "18 bit", nullptr)); + depth_24->setText(QApplication::translate("Config", "24 bit", nullptr)); + depth_32->setText(QApplication::translate("Config", "32 bit", nullptr)); + depth_32_argb->setText(QApplication::translate("Config", "32 bit ARGB", nullptr)); + TextLabel1_3->setText(QApplication::translate("Config", "Skin", nullptr)); + skin->setItemText(0, QApplication::translate("Config", "None", nullptr)); + + touchScreen->setText(QApplication::translate("Config", "Emulate touch screen (no mouse move)", nullptr)); + lcdScreen->setText(QApplication::translate("Config", "Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)", nullptr)); + TextLabel1->setText(QApplication::translate("Config", "<p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>.", nullptr)); + GroupBox1->setTitle(QApplication::translate("Config", "Gamma", nullptr)); + TextLabel3->setText(QApplication::translate("Config", "Blue", nullptr)); + blabel->setText(QApplication::translate("Config", "1.0", nullptr)); + TextLabel2->setText(QApplication::translate("Config", "Green", nullptr)); + glabel->setText(QApplication::translate("Config", "1.0", nullptr)); + TextLabel7->setText(QApplication::translate("Config", "All", nullptr)); + TextLabel8->setText(QApplication::translate("Config", "1.0", nullptr)); + TextLabel1_2->setText(QApplication::translate("Config", "Red", nullptr)); + rlabel->setText(QApplication::translate("Config", "1.0", nullptr)); + PushButton3->setText(QApplication::translate("Config", "Set all to 1.0", nullptr)); + buttonOk->setText(QApplication::translate("Config", "&OK", nullptr)); + buttonCancel->setText(QApplication::translate("Config", "&Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h index 384f406582..fde460c483 100644 --- a/tests/auto/tools/uic/baseline/connectdialog.ui.h +++ b/tests/auto/tools/uic/baseline/connectdialog.ui.h @@ -129,12 +129,12 @@ public: void retranslateUi(QDialog *ConnectDialog) { - ConnectDialog->setWindowTitle(QApplication::translate("ConnectDialog", "Configure Connection", Q_NULLPTR)); - signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", Q_NULLPTR)); - editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", Q_NULLPTR)); - slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", Q_NULLPTR)); - editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", Q_NULLPTR)); - showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", Q_NULLPTR)); + ConnectDialog->setWindowTitle(QApplication::translate("ConnectDialog", "Configure Connection", nullptr)); + signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", nullptr)); + editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", nullptr)); + slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", nullptr)); + editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", nullptr)); + showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/controller.ui.h b/tests/auto/tools/uic/baseline/controller.ui.h index 6f3162c5c6..41e3c005d2 100644 --- a/tests/auto/tools/uic/baseline/controller.ui.h +++ b/tests/auto/tools/uic/baseline/controller.ui.h @@ -78,12 +78,12 @@ public: void retranslateUi(QWidget *Controller) { - Controller->setWindowTitle(QApplication::translate("Controller", "Controller", Q_NULLPTR)); - label->setText(QApplication::translate("Controller", "Controller", Q_NULLPTR)); - decelerate->setText(QApplication::translate("Controller", "Decelerate", Q_NULLPTR)); - accelerate->setText(QApplication::translate("Controller", "Accelerate", Q_NULLPTR)); - right->setText(QApplication::translate("Controller", "Right", Q_NULLPTR)); - left->setText(QApplication::translate("Controller", "Left", Q_NULLPTR)); + Controller->setWindowTitle(QApplication::translate("Controller", "Controller", nullptr)); + label->setText(QApplication::translate("Controller", "Controller", nullptr)); + decelerate->setText(QApplication::translate("Controller", "Decelerate", nullptr)); + accelerate->setText(QApplication::translate("Controller", "Accelerate", nullptr)); + right->setText(QApplication::translate("Controller", "Right", nullptr)); + left->setText(QApplication::translate("Controller", "Left", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/cookies.ui.h b/tests/auto/tools/uic/baseline/cookies.ui.h index f1c7a6a4f9..d6b3c4a2f2 100644 --- a/tests/auto/tools/uic/baseline/cookies.ui.h +++ b/tests/auto/tools/uic/baseline/cookies.ui.h @@ -93,9 +93,9 @@ public: void retranslateUi(QDialog *CookiesDialog) { - CookiesDialog->setWindowTitle(QApplication::translate("CookiesDialog", "Cookies", Q_NULLPTR)); - removeButton->setText(QApplication::translate("CookiesDialog", "&Remove", Q_NULLPTR)); - removeAllButton->setText(QApplication::translate("CookiesDialog", "Remove &All Cookies", Q_NULLPTR)); + CookiesDialog->setWindowTitle(QApplication::translate("CookiesDialog", "Cookies", nullptr)); + removeButton->setText(QApplication::translate("CookiesDialog", "&Remove", nullptr)); + removeAllButton->setText(QApplication::translate("CookiesDialog", "Remove &All Cookies", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h index a86c40d289..80f40d0228 100644 --- a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h +++ b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h @@ -160,15 +160,15 @@ public: void retranslateUi(QDialog *CookiesExceptionsDialog) { - CookiesExceptionsDialog->setWindowTitle(QApplication::translate("CookiesExceptionsDialog", "Cookie Exceptions", Q_NULLPTR)); - newExceptionGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "New Exception", Q_NULLPTR)); - label->setText(QApplication::translate("CookiesExceptionsDialog", "Domain:", Q_NULLPTR)); - blockButton->setText(QApplication::translate("CookiesExceptionsDialog", "Block", Q_NULLPTR)); - allowForSessionButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow For Session", Q_NULLPTR)); - allowButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow", Q_NULLPTR)); - ExceptionsGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "Exceptions", Q_NULLPTR)); - removeButton->setText(QApplication::translate("CookiesExceptionsDialog", "&Remove", Q_NULLPTR)); - removeAllButton->setText(QApplication::translate("CookiesExceptionsDialog", "Remove &All", Q_NULLPTR)); + CookiesExceptionsDialog->setWindowTitle(QApplication::translate("CookiesExceptionsDialog", "Cookie Exceptions", nullptr)); + newExceptionGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "New Exception", nullptr)); + label->setText(QApplication::translate("CookiesExceptionsDialog", "Domain:", nullptr)); + blockButton->setText(QApplication::translate("CookiesExceptionsDialog", "Block", nullptr)); + allowForSessionButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow For Session", nullptr)); + allowButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow", nullptr)); + ExceptionsGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "Exceptions", nullptr)); + removeButton->setText(QApplication::translate("CookiesExceptionsDialog", "&Remove", nullptr)); + removeAllButton->setText(QApplication::translate("CookiesExceptionsDialog", "Remove &All", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h index e81f1bc2ca..46dfa8240c 100644 --- a/tests/auto/tools/uic/baseline/default.ui.h +++ b/tests/auto/tools/uic/baseline/default.ui.h @@ -228,84 +228,84 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", Q_NULLPTR)); - exitAction->setText(QApplication::translate("MainWindow", "&Exit", Q_NULLPTR)); - aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", Q_NULLPTR)); - editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", Q_NULLPTR)); - aboutAction->setText(QApplication::translate("MainWindow", "About", Q_NULLPTR)); - nameLabel->setText(QApplication::translate("MainWindow", "&Name:", Q_NULLPTR)); - nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", Q_NULLPTR)); - nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", Q_NULLPTR)); - nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", Q_NULLPTR)); - nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", Q_NULLPTR)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); + exitAction->setText(QApplication::translate("MainWindow", "&Exit", nullptr)); + aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", nullptr)); + editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", nullptr)); + aboutAction->setText(QApplication::translate("MainWindow", "About", nullptr)); + nameLabel->setText(QApplication::translate("MainWindow", "&Name:", nullptr)); + nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", nullptr)); + nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", nullptr)); + nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", nullptr)); + nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", nullptr)); #ifndef QT_NO_TOOLTIP - nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", Q_NULLPTR)); + nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", Q_NULLPTR)); + femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", nullptr)); #endif // QT_NO_TOOLTIP - femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", Q_NULLPTR)); + femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", nullptr)); #ifndef QT_NO_TOOLTIP - agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", Q_NULLPTR)); + agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", nullptr)); #endif // QT_NO_TOOLTIP - agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", Q_NULLPTR)); + agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", nullptr)); #ifndef QT_NO_TOOLTIP - maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", Q_NULLPTR)); + maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", nullptr)); #endif // QT_NO_TOOLTIP - maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", Q_NULLPTR)); - genderLabel->setText(QApplication::translate("MainWindow", "Gender:", Q_NULLPTR)); + maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", nullptr)); + genderLabel->setText(QApplication::translate("MainWindow", "Gender:", nullptr)); #ifndef QT_NO_TOOLTIP - ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); + ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", Q_NULLPTR)); + ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", nullptr)); #endif // QT_NO_STATUSTIP - ageLabel->setText(QApplication::translate("MainWindow", "&Age:", Q_NULLPTR)); - passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", Q_NULLPTR)); + ageLabel->setText(QApplication::translate("MainWindow", "&Age:", nullptr)); + passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", nullptr)); #ifndef QT_NO_TOOLTIP - passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); + passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", Q_NULLPTR)); + passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", nullptr)); #endif // QT_NO_STATUSTIP - passwordEdit->setText(QApplication::translate("MainWindow", "Password", Q_NULLPTR)); - label->setText(QApplication::translate("MainWindow", "Profession", Q_NULLPTR)); - countryLabel->setText(QApplication::translate("MainWindow", "&Country", Q_NULLPTR)); + passwordEdit->setText(QApplication::translate("MainWindow", "Password", nullptr)); + label->setText(QApplication::translate("MainWindow", "Profession", nullptr)); + countryLabel->setText(QApplication::translate("MainWindow", "&Country", nullptr)); const bool __sortingEnabled = professionList->isSortingEnabled(); professionList->setSortingEnabled(false); QListWidgetItem *___qlistwidgetitem = professionList->item(0); - ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", Q_NULLPTR)); + ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", nullptr)); QListWidgetItem *___qlistwidgetitem1 = professionList->item(1); - ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", Q_NULLPTR)); + ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", nullptr)); QListWidgetItem *___qlistwidgetitem2 = professionList->item(2); - ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", Q_NULLPTR)); + ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", nullptr)); professionList->setSortingEnabled(__sortingEnabled); #ifndef QT_NO_TOOLTIP - professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_WHATSTHIS - professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_WHATSTHIS - countryCombo->setItemText(0, QApplication::translate("MainWindow", "Germany", Q_NULLPTR)); - countryCombo->setItemText(1, QApplication::translate("MainWindow", "India", Q_NULLPTR)); - countryCombo->setItemText(2, QApplication::translate("MainWindow", "Norway", Q_NULLPTR)); - countryCombo->setItemText(3, QApplication::translate("MainWindow", "United States Of America", Q_NULLPTR)); - countryCombo->setItemText(4, QApplication::translate("MainWindow", "United Kingdom", Q_NULLPTR)); + countryCombo->setItemText(0, QApplication::translate("MainWindow", "Germany", nullptr)); + countryCombo->setItemText(1, QApplication::translate("MainWindow", "India", nullptr)); + countryCombo->setItemText(2, QApplication::translate("MainWindow", "Norway", nullptr)); + countryCombo->setItemText(3, QApplication::translate("MainWindow", "United States Of America", nullptr)); + countryCombo->setItemText(4, QApplication::translate("MainWindow", "United Kingdom", nullptr)); #ifndef QT_NO_TOOLTIP - countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", Q_NULLPTR)); + countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", Q_NULLPTR)); + countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", nullptr)); #endif // QT_NO_STATUSTIP - menu_File->setTitle(QApplication::translate("MainWindow", "&File", Q_NULLPTR)); - menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", Q_NULLPTR)); + menu_File->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); + menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/dialog.ui.h b/tests/auto/tools/uic/baseline/dialog.ui.h index 88ca359e20..afcb9f2f8b 100644 --- a/tests/auto/tools/uic/baseline/dialog.ui.h +++ b/tests/auto/tools/uic/baseline/dialog.ui.h @@ -61,10 +61,10 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); - loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", Q_NULLPTR)); - label->setText(QApplication::translate("Dialog", "Launch two of these dialogs. In the first, press the top button and load an image from a file. In the second, press the bottom button and display the loaded image from shared memory.", Q_NULLPTR)); - loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); + loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", nullptr)); + label->setText(QApplication::translate("Dialog", "Launch two of these dialogs. In the first, press the top button and load an image from a file. In the second, press the bottom button and display the loaded image from shared memory.", nullptr)); + loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/downloaditem.ui.h b/tests/auto/tools/uic/baseline/downloaditem.ui.h index 87f2efe3eb..cd3068daee 100644 --- a/tests/auto/tools/uic/baseline/downloaditem.ui.h +++ b/tests/auto/tools/uic/baseline/downloaditem.ui.h @@ -127,13 +127,13 @@ public: void retranslateUi(QWidget *DownloadItem) { - DownloadItem->setWindowTitle(QApplication::translate("DownloadItem", "Form", Q_NULLPTR)); - fileIcon->setText(QApplication::translate("DownloadItem", "Ico", Q_NULLPTR)); - fileNameLabel->setProperty("text", QVariant(QApplication::translate("DownloadItem", "Filename", Q_NULLPTR))); + DownloadItem->setWindowTitle(QApplication::translate("DownloadItem", "Form", nullptr)); + fileIcon->setText(QApplication::translate("DownloadItem", "Ico", nullptr)); + fileNameLabel->setProperty("text", QVariant(QApplication::translate("DownloadItem", "Filename", nullptr))); downloadInfoLabel->setProperty("text", QVariant(QString())); - tryAgainButton->setText(QApplication::translate("DownloadItem", "Try Again", Q_NULLPTR)); - stopButton->setText(QApplication::translate("DownloadItem", "Stop", Q_NULLPTR)); - openButton->setText(QApplication::translate("DownloadItem", "Open", Q_NULLPTR)); + tryAgainButton->setText(QApplication::translate("DownloadItem", "Try Again", nullptr)); + stopButton->setText(QApplication::translate("DownloadItem", "Stop", nullptr)); + openButton->setText(QApplication::translate("DownloadItem", "Open", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/downloads.ui.h b/tests/auto/tools/uic/baseline/downloads.ui.h index 4fbcceb7b4..4bc5f70bde 100644 --- a/tests/auto/tools/uic/baseline/downloads.ui.h +++ b/tests/auto/tools/uic/baseline/downloads.ui.h @@ -81,9 +81,9 @@ public: void retranslateUi(QDialog *DownloadDialog) { - DownloadDialog->setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", Q_NULLPTR)); - cleanupButton->setText(QApplication::translate("DownloadDialog", "Clean up", Q_NULLPTR)); - itemCount->setText(QApplication::translate("DownloadDialog", "0 Items", Q_NULLPTR)); + DownloadDialog->setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", nullptr)); + cleanupButton->setText(QApplication::translate("DownloadDialog", "Clean up", nullptr)); + itemCount->setText(QApplication::translate("DownloadDialog", "0 Items", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h index 446c5d54ff..554c5d754c 100644 --- a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h +++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h @@ -100,14 +100,14 @@ public: void retranslateUi(QDialog *embeddedDialog) { - embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", Q_NULLPTR)); - label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", Q_NULLPTR)); - layoutDirection->setItemText(0, QApplication::translate("embeddedDialog", "Left to Right", Q_NULLPTR)); - layoutDirection->setItemText(1, QApplication::translate("embeddedDialog", "Right to Left", Q_NULLPTR)); - - label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", Q_NULLPTR)); - label_3->setText(QApplication::translate("embeddedDialog", "Style:", Q_NULLPTR)); - label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", Q_NULLPTR)); + embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", nullptr)); + label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", nullptr)); + layoutDirection->setItemText(0, QApplication::translate("embeddedDialog", "Left to Right", nullptr)); + layoutDirection->setItemText(1, QApplication::translate("embeddedDialog", "Right to Left", nullptr)); + + label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", nullptr)); + label_3->setText(QApplication::translate("embeddedDialog", "Style:", nullptr)); + label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/enumnostdset.ui.h b/tests/auto/tools/uic/baseline/enumnostdset.ui.h index 2c7d4cb591..31e1348a1a 100644 --- a/tests/auto/tools/uic/baseline/enumnostdset.ui.h +++ b/tests/auto/tools/uic/baseline/enumnostdset.ui.h @@ -41,7 +41,7 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Form", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filespage.ui.h b/tests/auto/tools/uic/baseline/filespage.ui.h index d84d609e01..7337c3a044 100644 --- a/tests/auto/tools/uic/baseline/filespage.ui.h +++ b/tests/auto/tools/uic/baseline/filespage.ui.h @@ -83,10 +83,10 @@ public: void retranslateUi(QWidget *FilesPage) { - FilesPage->setWindowTitle(QApplication::translate("FilesPage", "Form", Q_NULLPTR)); - fileLabel->setText(QApplication::translate("FilesPage", "Files:", Q_NULLPTR)); - removeButton->setText(QApplication::translate("FilesPage", "Remove", Q_NULLPTR)); - removeAllButton->setText(QApplication::translate("FilesPage", "Remove All", Q_NULLPTR)); + FilesPage->setWindowTitle(QApplication::translate("FilesPage", "Form", nullptr)); + fileLabel->setText(QApplication::translate("FilesPage", "Files:", nullptr)); + removeButton->setText(QApplication::translate("FilesPage", "Remove", nullptr)); + removeAllButton->setText(QApplication::translate("FilesPage", "Remove All", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filternamedialog.ui.h b/tests/auto/tools/uic/baseline/filternamedialog.ui.h index b789b9045b..1a223e28aa 100644 --- a/tests/auto/tools/uic/baseline/filternamedialog.ui.h +++ b/tests/auto/tools/uic/baseline/filternamedialog.ui.h @@ -79,8 +79,8 @@ public: void retranslateUi(QDialog *FilterNameDialogClass) { - FilterNameDialogClass->setWindowTitle(QApplication::translate("FilterNameDialogClass", "FilterNameDialog", Q_NULLPTR)); - label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", Q_NULLPTR)); + FilterNameDialogClass->setWindowTitle(QApplication::translate("FilterNameDialogClass", "FilterNameDialog", nullptr)); + label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filterpage.ui.h b/tests/auto/tools/uic/baseline/filterpage.ui.h index d2e37dc5a4..c260c82efe 100644 --- a/tests/auto/tools/uic/baseline/filterpage.ui.h +++ b/tests/auto/tools/uic/baseline/filterpage.ui.h @@ -105,14 +105,14 @@ public: void retranslateUi(QWidget *FilterPage) { - FilterPage->setWindowTitle(QApplication::translate("FilterPage", "Form", Q_NULLPTR)); - label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", Q_NULLPTR)); + FilterPage->setWindowTitle(QApplication::translate("FilterPage", "Form", nullptr)); + label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", nullptr)); + groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", nullptr)); QTreeWidgetItem *___qtreewidgetitem = customFilterWidget->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", Q_NULLPTR)); - ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", Q_NULLPTR)); - addButton->setText(QApplication::translate("FilterPage", "Add", Q_NULLPTR)); - removeButton->setText(QApplication::translate("FilterPage", "Remove", Q_NULLPTR)); + ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", nullptr)); + ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", nullptr)); + addButton->setText(QApplication::translate("FilterPage", "Add", nullptr)); + removeButton->setText(QApplication::translate("FilterPage", "Remove", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h index de354627f0..4d7d1ac92c 100644 --- a/tests/auto/tools/uic/baseline/finddialog.ui.h +++ b/tests/auto/tools/uic/baseline/finddialog.ui.h @@ -196,40 +196,40 @@ public: void retranslateUi(QDialog *FindDialog) { - FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Find", Q_NULLPTR)); + FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Find", nullptr)); #ifndef QT_NO_WHATSTHIS - FindDialog->setWhatsThis(QApplication::translate("FindDialog", "This window allows you to search for some text in the translation source file.", Q_NULLPTR)); + FindDialog->setWhatsThis(QApplication::translate("FindDialog", "This window allows you to search for some text in the translation source file.", nullptr)); #endif // QT_NO_WHATSTHIS - findWhat->setText(QApplication::translate("FindDialog", "&Find what:", Q_NULLPTR)); + findWhat->setText(QApplication::translate("FindDialog", "&Find what:", nullptr)); #ifndef QT_NO_WHATSTHIS - led->setWhatsThis(QApplication::translate("FindDialog", "Type in the text to search for.", Q_NULLPTR)); + led->setWhatsThis(QApplication::translate("FindDialog", "Type in the text to search for.", nullptr)); #endif // QT_NO_WHATSTHIS - groupBox->setTitle(QApplication::translate("FindDialog", "Options", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("FindDialog", "Options", nullptr)); #ifndef QT_NO_WHATSTHIS - sourceText->setWhatsThis(QApplication::translate("FindDialog", "Source texts are searched when checked.", Q_NULLPTR)); + sourceText->setWhatsThis(QApplication::translate("FindDialog", "Source texts are searched when checked.", nullptr)); #endif // QT_NO_WHATSTHIS - sourceText->setText(QApplication::translate("FindDialog", "&Source texts", Q_NULLPTR)); + sourceText->setText(QApplication::translate("FindDialog", "&Source texts", nullptr)); #ifndef QT_NO_WHATSTHIS - translations->setWhatsThis(QApplication::translate("FindDialog", "Translations are searched when checked.", Q_NULLPTR)); + translations->setWhatsThis(QApplication::translate("FindDialog", "Translations are searched when checked.", nullptr)); #endif // QT_NO_WHATSTHIS - translations->setText(QApplication::translate("FindDialog", "&Translations", Q_NULLPTR)); + translations->setText(QApplication::translate("FindDialog", "&Translations", nullptr)); #ifndef QT_NO_WHATSTHIS - matchCase->setWhatsThis(QApplication::translate("FindDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", Q_NULLPTR)); + matchCase->setWhatsThis(QApplication::translate("FindDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", nullptr)); #endif // QT_NO_WHATSTHIS - matchCase->setText(QApplication::translate("FindDialog", "&Match case", Q_NULLPTR)); + matchCase->setText(QApplication::translate("FindDialog", "&Match case", nullptr)); #ifndef QT_NO_WHATSTHIS - comments->setWhatsThis(QApplication::translate("FindDialog", "Comments and contexts are searched when checked.", Q_NULLPTR)); + comments->setWhatsThis(QApplication::translate("FindDialog", "Comments and contexts are searched when checked.", nullptr)); #endif // QT_NO_WHATSTHIS - comments->setText(QApplication::translate("FindDialog", "&Comments", Q_NULLPTR)); - ignoreAccelerators->setText(QApplication::translate("FindDialog", "Ignore &accelerators", Q_NULLPTR)); + comments->setText(QApplication::translate("FindDialog", "&Comments", nullptr)); + ignoreAccelerators->setText(QApplication::translate("FindDialog", "Ignore &accelerators", nullptr)); #ifndef QT_NO_WHATSTHIS - findNxt->setWhatsThis(QApplication::translate("FindDialog", "Click here to find the next occurrence of the text you typed in.", Q_NULLPTR)); + findNxt->setWhatsThis(QApplication::translate("FindDialog", "Click here to find the next occurrence of the text you typed in.", nullptr)); #endif // QT_NO_WHATSTHIS - findNxt->setText(QApplication::translate("FindDialog", "Find Next", Q_NULLPTR)); + findNxt->setText(QApplication::translate("FindDialog", "Find Next", nullptr)); #ifndef QT_NO_WHATSTHIS - cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", Q_NULLPTR)); + cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", nullptr)); #endif // QT_NO_WHATSTHIS - cancel->setText(QApplication::translate("FindDialog", "Cancel", Q_NULLPTR)); + cancel->setText(QApplication::translate("FindDialog", "Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/form.ui.h b/tests/auto/tools/uic/baseline/form.ui.h index 89a08c2050..4cd134102c 100644 --- a/tests/auto/tools/uic/baseline/form.ui.h +++ b/tests/auto/tools/uic/baseline/form.ui.h @@ -126,9 +126,9 @@ public: void retranslateUi(QWidget *WorldTimeForm) { - WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", Q_NULLPTR)); - label->setText(QApplication::translate("WorldTimeForm", "Current time:", Q_NULLPTR)); - label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", Q_NULLPTR)); + WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", nullptr)); + label->setText(QApplication::translate("WorldTimeForm", "Current time:", nullptr)); + label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h index 2aafa8b6c0..77d0109548 100644 --- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h @@ -274,17 +274,17 @@ public: void retranslateUi(QDialog *FormWindowSettings) { - FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", Q_NULLPTR)); - layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", Q_NULLPTR)); - label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", Q_NULLPTR)); - label->setText(QApplication::translate("FormWindowSettings", "&Margin:", Q_NULLPTR)); - layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", Q_NULLPTR)); - label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", Q_NULLPTR)); - label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", Q_NULLPTR)); - pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", Q_NULLPTR)); - includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", Q_NULLPTR)); - pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", Q_NULLPTR)); - gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", Q_NULLPTR)); + FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", nullptr)); + layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", nullptr)); + label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", nullptr)); + label->setText(QApplication::translate("FormWindowSettings", "&Margin:", nullptr)); + layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", nullptr)); + label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", nullptr)); + label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", nullptr)); + pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", nullptr)); + includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", nullptr)); + pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", nullptr)); + gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/generalpage.ui.h b/tests/auto/tools/uic/baseline/generalpage.ui.h index 6cdc6f812e..3c36c75bfa 100644 --- a/tests/auto/tools/uic/baseline/generalpage.ui.h +++ b/tests/auto/tools/uic/baseline/generalpage.ui.h @@ -76,9 +76,9 @@ public: void retranslateUi(QWidget *GeneralPage) { - GeneralPage->setWindowTitle(QApplication::translate("GeneralPage", "Form", Q_NULLPTR)); - label->setText(QApplication::translate("GeneralPage", "Namespace:", Q_NULLPTR)); - label_2->setText(QApplication::translate("GeneralPage", "Virtual Folder:", Q_NULLPTR)); + GeneralPage->setWindowTitle(QApplication::translate("GeneralPage", "Form", nullptr)); + label->setText(QApplication::translate("GeneralPage", "Namespace:", nullptr)); + label_2->setText(QApplication::translate("GeneralPage", "Virtual Folder:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/gridalignment.ui.h b/tests/auto/tools/uic/baseline/gridalignment.ui.h index 3513e0e727..f7f2d6372f 100644 --- a/tests/auto/tools/uic/baseline/gridalignment.ui.h +++ b/tests/auto/tools/uic/baseline/gridalignment.ui.h @@ -64,11 +64,11 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); - pushButton->setText(QApplication::translate("Form", "Left", Q_NULLPTR)); - pushButton_3->setText(QApplication::translate("Form", "Top", Q_NULLPTR)); - pushButton_2->setText(QApplication::translate("Form", "Right", Q_NULLPTR)); - pushButton_4->setText(QApplication::translate("Form", "Bottom", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Form", nullptr)); + pushButton->setText(QApplication::translate("Form", "Left", nullptr)); + pushButton_3->setText(QApplication::translate("Form", "Top", nullptr)); + pushButton_2->setText(QApplication::translate("Form", "Right", nullptr)); + pushButton_4->setText(QApplication::translate("Form", "Bottom", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/gridpanel.ui.h b/tests/auto/tools/uic/baseline/gridpanel.ui.h index 2c61c7228b..95437a27cf 100644 --- a/tests/auto/tools/uic/baseline/gridpanel.ui.h +++ b/tests/auto/tools/uic/baseline/gridpanel.ui.h @@ -135,14 +135,14 @@ public: void retranslateUi(QWidget *qdesigner_internal__GridPanel) { - qdesigner_internal__GridPanel->setWindowTitle(QApplication::translate("qdesigner_internal::GridPanel", "Form", Q_NULLPTR)); - m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", Q_NULLPTR)); - m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", Q_NULLPTR)); - m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", Q_NULLPTR)); - m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", Q_NULLPTR)); - label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", Q_NULLPTR)); - m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", Q_NULLPTR)); + qdesigner_internal__GridPanel->setWindowTitle(QApplication::translate("qdesigner_internal::GridPanel", "Form", nullptr)); + m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", nullptr)); + m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", nullptr)); + m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", nullptr)); + m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", nullptr)); + label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", nullptr)); + m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/helpdialog.ui.h b/tests/auto/tools/uic/baseline/helpdialog.ui.h index 77cc30314f..39f9852620 100644 --- a/tests/auto/tools/uic/baseline/helpdialog.ui.h +++ b/tests/auto/tools/uic/baseline/helpdialog.ui.h @@ -298,77 +298,77 @@ public: void retranslateUi(QWidget *HelpDialog) { - HelpDialog->setWindowTitle(QApplication::translate("HelpDialog", "Help", Q_NULLPTR)); + HelpDialog->setWindowTitle(QApplication::translate("HelpDialog", "Help", nullptr)); #ifndef QT_NO_WHATSTHIS - HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p>", Q_NULLPTR)); + HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p>", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - tabWidget->setWhatsThis(QApplication::translate("HelpDialog", "Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.", Q_NULLPTR)); + tabWidget->setWhatsThis(QApplication::translate("HelpDialog", "Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.", nullptr)); #endif // QT_NO_WHATSTHIS QTreeWidgetItem *___qtreewidgetitem = listContents->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("HelpDialog", "column 1", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("HelpDialog", "column 1", nullptr)); #ifndef QT_NO_WHATSTHIS - listContents->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p>", Q_NULLPTR)); + listContents->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p>", nullptr)); #endif // QT_NO_WHATSTHIS - tabWidget->setTabText(tabWidget->indexOf(contentPage), QApplication::translate("HelpDialog", "Con&tents", Q_NULLPTR)); - TextLabel1->setText(QApplication::translate("HelpDialog", "&Look For:", Q_NULLPTR)); + tabWidget->setTabText(tabWidget->indexOf(contentPage), QApplication::translate("HelpDialog", "Con&tents", nullptr)); + TextLabel1->setText(QApplication::translate("HelpDialog", "&Look For:", nullptr)); #ifndef QT_NO_TOOLTIP - editIndex->setToolTip(QApplication::translate("HelpDialog", "Enter keyword", Q_NULLPTR)); + editIndex->setToolTip(QApplication::translate("HelpDialog", "Enter keyword", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - editIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p>", Q_NULLPTR)); + editIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p>", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - listIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p>", Q_NULLPTR)); + listIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p>", nullptr)); #endif // QT_NO_WHATSTHIS - tabWidget->setTabText(tabWidget->indexOf(indexPage), QApplication::translate("HelpDialog", "&Index", Q_NULLPTR)); + tabWidget->setTabText(tabWidget->indexOf(indexPage), QApplication::translate("HelpDialog", "&Index", nullptr)); QTreeWidgetItem *___qtreewidgetitem1 = listBookmarks->headerItem(); - ___qtreewidgetitem1->setText(0, QApplication::translate("HelpDialog", "column 1", Q_NULLPTR)); + ___qtreewidgetitem1->setText(0, QApplication::translate("HelpDialog", "column 1", nullptr)); #ifndef QT_NO_WHATSTHIS - listBookmarks->setWhatsThis(QApplication::translate("HelpDialog", "Displays the list of bookmarks.", Q_NULLPTR)); + listBookmarks->setWhatsThis(QApplication::translate("HelpDialog", "Displays the list of bookmarks.", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_TOOLTIP - buttonAdd->setToolTip(QApplication::translate("HelpDialog", "Add new bookmark", Q_NULLPTR)); + buttonAdd->setToolTip(QApplication::translate("HelpDialog", "Add new bookmark", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - buttonAdd->setWhatsThis(QApplication::translate("HelpDialog", "Add the currently displayed page as a new bookmark.", Q_NULLPTR)); + buttonAdd->setWhatsThis(QApplication::translate("HelpDialog", "Add the currently displayed page as a new bookmark.", nullptr)); #endif // QT_NO_WHATSTHIS - buttonAdd->setText(QApplication::translate("HelpDialog", "&New", Q_NULLPTR)); + buttonAdd->setText(QApplication::translate("HelpDialog", "&New", nullptr)); #ifndef QT_NO_TOOLTIP - buttonRemove->setToolTip(QApplication::translate("HelpDialog", "Delete bookmark", Q_NULLPTR)); + buttonRemove->setToolTip(QApplication::translate("HelpDialog", "Delete bookmark", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - buttonRemove->setWhatsThis(QApplication::translate("HelpDialog", "Delete the selected bookmark.", Q_NULLPTR)); + buttonRemove->setWhatsThis(QApplication::translate("HelpDialog", "Delete the selected bookmark.", nullptr)); #endif // QT_NO_WHATSTHIS - buttonRemove->setText(QApplication::translate("HelpDialog", "&Delete", Q_NULLPTR)); - tabWidget->setTabText(tabWidget->indexOf(bookmarkPage), QApplication::translate("HelpDialog", "&Bookmarks", Q_NULLPTR)); - TextLabel1_2->setText(QApplication::translate("HelpDialog", "Searching f&or:", Q_NULLPTR)); + buttonRemove->setText(QApplication::translate("HelpDialog", "&Delete", nullptr)); + tabWidget->setTabText(tabWidget->indexOf(bookmarkPage), QApplication::translate("HelpDialog", "&Bookmarks", nullptr)); + TextLabel1_2->setText(QApplication::translate("HelpDialog", "Searching f&or:", nullptr)); #ifndef QT_NO_TOOLTIP - termsEdit->setToolTip(QApplication::translate("HelpDialog", "Enter searchword(s).", Q_NULLPTR)); + termsEdit->setToolTip(QApplication::translate("HelpDialog", "Enter searchword(s).", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p>", Q_NULLPTR)); + termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p>", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - resultBox->setWhatsThis(QApplication::translate("HelpDialog", "<b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p>", Q_NULLPTR)); + resultBox->setWhatsThis(QApplication::translate("HelpDialog", "<b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p>", nullptr)); #endif // QT_NO_WHATSTHIS - TextLabel2->setText(QApplication::translate("HelpDialog", "Found &Documents:", Q_NULLPTR)); + TextLabel2->setText(QApplication::translate("HelpDialog", "Found &Documents:", nullptr)); #ifndef QT_NO_TOOLTIP - helpButton->setToolTip(QApplication::translate("HelpDialog", "Display the help page.", Q_NULLPTR)); + helpButton->setToolTip(QApplication::translate("HelpDialog", "Display the help page.", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - helpButton->setWhatsThis(QApplication::translate("HelpDialog", "Display the help page for the full text search.", Q_NULLPTR)); + helpButton->setWhatsThis(QApplication::translate("HelpDialog", "Display the help page for the full text search.", nullptr)); #endif // QT_NO_WHATSTHIS - helpButton->setText(QApplication::translate("HelpDialog", "He&lp", Q_NULLPTR)); + helpButton->setText(QApplication::translate("HelpDialog", "He&lp", nullptr)); #ifndef QT_NO_TOOLTIP - searchButton->setToolTip(QApplication::translate("HelpDialog", "Start searching.", Q_NULLPTR)); + searchButton->setToolTip(QApplication::translate("HelpDialog", "Start searching.", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - searchButton->setWhatsThis(QApplication::translate("HelpDialog", "Pressing this button starts the search.", Q_NULLPTR)); + searchButton->setWhatsThis(QApplication::translate("HelpDialog", "Pressing this button starts the search.", nullptr)); #endif // QT_NO_WHATSTHIS - searchButton->setText(QApplication::translate("HelpDialog", "&Search", Q_NULLPTR)); - tabWidget->setTabText(tabWidget->indexOf(searchPage), QApplication::translate("HelpDialog", "&Search", Q_NULLPTR)); - labelPrepare->setText(QApplication::translate("HelpDialog", "Preparing...", Q_NULLPTR)); + searchButton->setText(QApplication::translate("HelpDialog", "&Search", nullptr)); + tabWidget->setTabText(tabWidget->indexOf(searchPage), QApplication::translate("HelpDialog", "&Search", nullptr)); + labelPrepare->setText(QApplication::translate("HelpDialog", "Preparing...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/history.ui.h b/tests/auto/tools/uic/baseline/history.ui.h index b0eccba5bc..ed0637bfcf 100644 --- a/tests/auto/tools/uic/baseline/history.ui.h +++ b/tests/auto/tools/uic/baseline/history.ui.h @@ -93,9 +93,9 @@ public: void retranslateUi(QDialog *HistoryDialog) { - HistoryDialog->setWindowTitle(QApplication::translate("HistoryDialog", "History", Q_NULLPTR)); - removeButton->setText(QApplication::translate("HistoryDialog", "&Remove", Q_NULLPTR)); - removeAllButton->setText(QApplication::translate("HistoryDialog", "Remove &All", Q_NULLPTR)); + HistoryDialog->setWindowTitle(QApplication::translate("HistoryDialog", "History", nullptr)); + removeButton->setText(QApplication::translate("HistoryDialog", "&Remove", nullptr)); + removeAllButton->setText(QApplication::translate("HistoryDialog", "Remove &All", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h index f9cc837761..2724c7d147 100644 --- a/tests/auto/tools/uic/baseline/icontheme.ui.h +++ b/tests/auto/tools/uic/baseline/icontheme.ui.h @@ -77,10 +77,10 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); - fileicon->setText(QApplication::translate("Form", "fileicon", Q_NULLPTR)); - fileandthemeicon->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); - themeicon->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Form", nullptr)); + fileicon->setText(QApplication::translate("Form", "fileicon", nullptr)); + fileandthemeicon->setText(QApplication::translate("Form", "PushButton", nullptr)); + themeicon->setText(QApplication::translate("Form", "PushButton", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/identifierpage.ui.h b/tests/auto/tools/uic/baseline/identifierpage.ui.h index 68649a8a9e..fd77cc3f8c 100644 --- a/tests/auto/tools/uic/baseline/identifierpage.ui.h +++ b/tests/auto/tools/uic/baseline/identifierpage.ui.h @@ -92,10 +92,10 @@ public: void retranslateUi(QWidget *IdentifierPage) { - IdentifierPage->setWindowTitle(QApplication::translate("IdentifierPage", "Form", Q_NULLPTR)); - identifierCheckBox->setText(QApplication::translate("IdentifierPage", "Create identifiers", Q_NULLPTR)); - globalButton->setText(QApplication::translate("IdentifierPage", "Global prefix:", Q_NULLPTR)); - fileNameButton->setText(QApplication::translate("IdentifierPage", "Inherit prefix from file names", Q_NULLPTR)); + IdentifierPage->setWindowTitle(QApplication::translate("IdentifierPage", "Form", nullptr)); + identifierCheckBox->setText(QApplication::translate("IdentifierPage", "Create identifiers", nullptr)); + globalButton->setText(QApplication::translate("IdentifierPage", "Global prefix:", nullptr)); + fileNameButton->setText(QApplication::translate("IdentifierPage", "Inherit prefix from file names", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h index 9ce2a577f0..2b55d1f0ab 100644 --- a/tests/auto/tools/uic/baseline/imagedialog.ui.h +++ b/tests/auto/tools/uic/baseline/imagedialog.ui.h @@ -199,14 +199,14 @@ public: void retranslateUi(QDialog *dialog) { - dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", Q_NULLPTR)); - widthLabel->setText(QApplication::translate("ImageDialog", "Width:", Q_NULLPTR)); - heightLabel->setText(QApplication::translate("ImageDialog", "Height:", Q_NULLPTR)); - nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", Q_NULLPTR)); - nameLabel->setText(QApplication::translate("ImageDialog", "Name:", Q_NULLPTR)); - colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", Q_NULLPTR)); - okButton->setText(QApplication::translate("ImageDialog", "OK", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", Q_NULLPTR)); + dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", nullptr)); + widthLabel->setText(QApplication::translate("ImageDialog", "Width:", nullptr)); + heightLabel->setText(QApplication::translate("ImageDialog", "Height:", nullptr)); + nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", nullptr)); + nameLabel->setText(QApplication::translate("ImageDialog", "Name:", nullptr)); + colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", nullptr)); + okButton->setText(QApplication::translate("ImageDialog", "OK", nullptr)); + cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/inputpage.ui.h b/tests/auto/tools/uic/baseline/inputpage.ui.h index ad97dfcf85..542cf82b91 100644 --- a/tests/auto/tools/uic/baseline/inputpage.ui.h +++ b/tests/auto/tools/uic/baseline/inputpage.ui.h @@ -84,9 +84,9 @@ public: void retranslateUi(QWidget *InputPage) { - InputPage->setWindowTitle(QApplication::translate("InputPage", "Form", Q_NULLPTR)); - label->setText(QApplication::translate("InputPage", "File name:", Q_NULLPTR)); - browseButton->setText(QApplication::translate("InputPage", "...", Q_NULLPTR)); + InputPage->setWindowTitle(QApplication::translate("InputPage", "Form", nullptr)); + label->setText(QApplication::translate("InputPage", "File name:", nullptr)); + browseButton->setText(QApplication::translate("InputPage", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h index 5bbd7b6f08..657e88712d 100644 --- a/tests/auto/tools/uic/baseline/installdialog.ui.h +++ b/tests/auto/tools/uic/baseline/installdialog.ui.h @@ -123,13 +123,13 @@ public: void retranslateUi(QDialog *InstallDialog) { - InstallDialog->setWindowTitle(QApplication::translate("InstallDialog", "Install Documentation", Q_NULLPTR)); - label->setText(QApplication::translate("InstallDialog", "Available Documentation:", Q_NULLPTR)); - installButton->setText(QApplication::translate("InstallDialog", "Install", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", Q_NULLPTR)); - closeButton->setText(QApplication::translate("InstallDialog", "Close", Q_NULLPTR)); - label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", Q_NULLPTR)); - browseButton->setText(QApplication::translate("InstallDialog", "...", Q_NULLPTR)); + InstallDialog->setWindowTitle(QApplication::translate("InstallDialog", "Install Documentation", nullptr)); + label->setText(QApplication::translate("InstallDialog", "Available Documentation:", nullptr)); + installButton->setText(QApplication::translate("InstallDialog", "Install", nullptr)); + cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", nullptr)); + closeButton->setText(QApplication::translate("InstallDialog", "Close", nullptr)); + label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", nullptr)); + browseButton->setText(QApplication::translate("InstallDialog", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h index 7d22656471..20e1ed857c 100644 --- a/tests/auto/tools/uic/baseline/languagesdialog.ui.h +++ b/tests/auto/tools/uic/baseline/languagesdialog.ui.h @@ -109,39 +109,39 @@ public: void retranslateUi(QDialog *LanguagesDialog) { - LanguagesDialog->setWindowTitle(QApplication::translate("LanguagesDialog", "Auxiliary Languages", Q_NULLPTR)); + LanguagesDialog->setWindowTitle(QApplication::translate("LanguagesDialog", "Auxiliary Languages", nullptr)); QTreeWidgetItem *___qtreewidgetitem = languagesList->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("LanguagesDialog", "File", Q_NULLPTR)); - ___qtreewidgetitem->setText(0, QApplication::translate("LanguagesDialog", "Locale", Q_NULLPTR)); + ___qtreewidgetitem->setText(1, QApplication::translate("LanguagesDialog", "File", nullptr)); + ___qtreewidgetitem->setText(0, QApplication::translate("LanguagesDialog", "Locale", nullptr)); #ifndef QT_NO_TOOLTIP upButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Move selected language up</p></body></html>", Q_NULLPTR)); +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Move selected language up</p></body></html>", nullptr)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("LanguagesDialog", "up", Q_NULLPTR)); + upButton->setText(QApplication::translate("LanguagesDialog", "up", nullptr)); #ifndef QT_NO_TOOLTIP downButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;\">Move selected language down</p></body></html>", Q_NULLPTR)); +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;\">Move selected language down</p></body></html>", nullptr)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("LanguagesDialog", "down", Q_NULLPTR)); + downButton->setText(QApplication::translate("LanguagesDialog", "down", nullptr)); #ifndef QT_NO_TOOLTIP removeButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Remove selected language</p></body></html>", Q_NULLPTR)); +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Remove selected language</p></body></html>", nullptr)); #endif // QT_NO_TOOLTIP - removeButton->setText(QApplication::translate("LanguagesDialog", "remove", Q_NULLPTR)); + removeButton->setText(QApplication::translate("LanguagesDialog", "remove", nullptr)); #ifndef QT_NO_TOOLTIP openFileButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Open auxiliary language files</p></body></html>", Q_NULLPTR)); +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Open auxiliary language files</p></body></html>", nullptr)); #endif // QT_NO_TOOLTIP - openFileButton->setText(QApplication::translate("LanguagesDialog", "...", Q_NULLPTR)); - okButton->setText(QApplication::translate("LanguagesDialog", "OK", Q_NULLPTR)); + openFileButton->setText(QApplication::translate("LanguagesDialog", "...", nullptr)); + okButton->setText(QApplication::translate("LanguagesDialog", "OK", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h index 2e18e6d71c..f3f09e2f1e 100644 --- a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h @@ -175,28 +175,28 @@ public: void retranslateUi(QDialog *qdesigner_internal__ListWidgetEditor) { - qdesigner_internal__ListWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Dialog", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", Q_NULLPTR)); + qdesigner_internal__ListWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Dialog", nullptr)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", nullptr)); #ifndef QT_NO_TOOLTIP - listWidget->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", Q_NULLPTR)); + listWidget->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "New Item", Q_NULLPTR)); + newItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "New Item", nullptr)); #endif // QT_NO_TOOLTIP - newItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&New", Q_NULLPTR)); + newItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&New", nullptr)); #ifndef QT_NO_TOOLTIP - deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Delete Item", Q_NULLPTR)); + deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Delete Item", nullptr)); #endif // QT_NO_TOOLTIP - deleteItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&Delete", Q_NULLPTR)); + deleteItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&Delete", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Up", Q_NULLPTR)); + moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Up", nullptr)); #endif // QT_NO_TOOLTIP - moveItemUpButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "U", Q_NULLPTR)); + moveItemUpButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "U", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Down", Q_NULLPTR)); + moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Down", nullptr)); #endif // QT_NO_TOOLTIP - moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", Q_NULLPTR)); + moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/mainwindow.ui.h b/tests/auto/tools/uic/baseline/mainwindow.ui.h index 62b1e8766c..496b105e5d 100644 --- a/tests/auto/tools/uic/baseline/mainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/mainwindow.ui.h @@ -363,30 +363,30 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MakeQPF", Q_NULLPTR)); - actionAdd_Custom_Font->setText(QApplication::translate("MainWindow", "&Add Custom Font...", Q_NULLPTR)); - action_Exit->setText(QApplication::translate("MainWindow", "&Exit", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("MainWindow", "Font Properties", Q_NULLPTR)); - label->setText(QApplication::translate("MainWindow", "Family:", Q_NULLPTR)); - label_2->setText(QApplication::translate("MainWindow", "Pixel Size:", Q_NULLPTR)); - label_7->setText(QApplication::translate("MainWindow", "Weight:", Q_NULLPTR)); - italic->setText(QApplication::translate("MainWindow", "Italic", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("MainWindow", "Glyph Coverage", Q_NULLPTR)); - chooseFromCodePoints->setText(QApplication::translate("MainWindow", "Choose from Unicode Codepoints:", Q_NULLPTR)); - selectAll->setText(QApplication::translate("MainWindow", "Select &All", Q_NULLPTR)); - deselectAll->setText(QApplication::translate("MainWindow", "&Deselect All", Q_NULLPTR)); - invertSelection->setText(QApplication::translate("MainWindow", "&Invert Selection", Q_NULLPTR)); - chooseFromSampleFile->setText(QApplication::translate("MainWindow", "Choose from Sample Text File (UTF-8 Encoded):", Q_NULLPTR)); - label_5->setText(QApplication::translate("MainWindow", "Path:", Q_NULLPTR)); - browseSampleFile->setText(QApplication::translate("MainWindow", "Browse...", Q_NULLPTR)); - charCount->setText(QApplication::translate("MainWindow", "TextLabel", Q_NULLPTR)); - groupBox_3->setTitle(QApplication::translate("MainWindow", "Preview", Q_NULLPTR)); - groupBox_4->setTitle(QApplication::translate("MainWindow", "Output Options", Q_NULLPTR)); - label_3->setText(QApplication::translate("MainWindow", "Path:", Q_NULLPTR)); - browsePath->setText(QApplication::translate("MainWindow", "Browse...", Q_NULLPTR)); - label_4->setText(QApplication::translate("MainWindow", "Filename:", Q_NULLPTR)); - generate->setText(QApplication::translate("MainWindow", "Generate Pre-Rendered Font...", Q_NULLPTR)); - menuFile->setTitle(QApplication::translate("MainWindow", "File", Q_NULLPTR)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MakeQPF", nullptr)); + actionAdd_Custom_Font->setText(QApplication::translate("MainWindow", "&Add Custom Font...", nullptr)); + action_Exit->setText(QApplication::translate("MainWindow", "&Exit", nullptr)); + groupBox->setTitle(QApplication::translate("MainWindow", "Font Properties", nullptr)); + label->setText(QApplication::translate("MainWindow", "Family:", nullptr)); + label_2->setText(QApplication::translate("MainWindow", "Pixel Size:", nullptr)); + label_7->setText(QApplication::translate("MainWindow", "Weight:", nullptr)); + italic->setText(QApplication::translate("MainWindow", "Italic", nullptr)); + groupBox_2->setTitle(QApplication::translate("MainWindow", "Glyph Coverage", nullptr)); + chooseFromCodePoints->setText(QApplication::translate("MainWindow", "Choose from Unicode Codepoints:", nullptr)); + selectAll->setText(QApplication::translate("MainWindow", "Select &All", nullptr)); + deselectAll->setText(QApplication::translate("MainWindow", "&Deselect All", nullptr)); + invertSelection->setText(QApplication::translate("MainWindow", "&Invert Selection", nullptr)); + chooseFromSampleFile->setText(QApplication::translate("MainWindow", "Choose from Sample Text File (UTF-8 Encoded):", nullptr)); + label_5->setText(QApplication::translate("MainWindow", "Path:", nullptr)); + browseSampleFile->setText(QApplication::translate("MainWindow", "Browse...", nullptr)); + charCount->setText(QApplication::translate("MainWindow", "TextLabel", nullptr)); + groupBox_3->setTitle(QApplication::translate("MainWindow", "Preview", nullptr)); + groupBox_4->setTitle(QApplication::translate("MainWindow", "Output Options", nullptr)); + label_3->setText(QApplication::translate("MainWindow", "Path:", nullptr)); + browsePath->setText(QApplication::translate("MainWindow", "Browse...", nullptr)); + label_4->setText(QApplication::translate("MainWindow", "Filename:", nullptr)); + generate->setText(QApplication::translate("MainWindow", "Generate Pre-Rendered Font...", nullptr)); + menuFile->setTitle(QApplication::translate("MainWindow", "File", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/mydialog.ui.h b/tests/auto/tools/uic/baseline/mydialog.ui.h index 279dd0e9bf..35b787b591 100644 --- a/tests/auto/tools/uic/baseline/mydialog.ui.h +++ b/tests/auto/tools/uic/baseline/mydialog.ui.h @@ -59,11 +59,11 @@ public: void retranslateUi(QDialog *MyDialog) { - MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", Q_NULLPTR)); - aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", Q_NULLPTR)); - aButton->setText(QApplication::translate("MyDialog", "&Quit", Q_NULLPTR)); + MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", nullptr)); + aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", nullptr)); + aButton->setText(QApplication::translate("MyDialog", "&Quit", nullptr)); #ifndef QT_NO_SHORTCUT - aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", Q_NULLPTR)); + aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", nullptr)); #endif // QT_NO_SHORTCUT } // retranslateUi diff --git a/tests/auto/tools/uic/baseline/myform.ui.h b/tests/auto/tools/uic/baseline/myform.ui.h index 6e7873c5ad..eeddb03306 100644 --- a/tests/auto/tools/uic/baseline/myform.ui.h +++ b/tests/auto/tools/uic/baseline/myform.ui.h @@ -123,17 +123,17 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Export Document", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("Form", "Export Options", Q_NULLPTR)); - radioButton_2->setText(QApplication::translate("Form", "&DocBook", Q_NULLPTR)); - radioButton->setText(QApplication::translate("Form", "&LaTeX", Q_NULLPTR)); - checkBox_2->setText(QApplication::translate("Form", "Include p&ictures", Q_NULLPTR)); - checkBox->setText(QApplication::translate("Form", "&Compress", Q_NULLPTR)); - radioButton_2_2->setText(QApplication::translate("Form", "&HTML", Q_NULLPTR)); - radioButton_3->setText(QApplication::translate("Form", "&PostScript", Q_NULLPTR)); - radioButton_4->setText(QApplication::translate("Form", "PD&F", Q_NULLPTR)); - checkBox_3->setText(QApplication::translate("Form", "Include &metadata", Q_NULLPTR)); - checkBox_4->setText(QApplication::translate("Form", "Create inde&x", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Export Document", nullptr)); + groupBox->setTitle(QApplication::translate("Form", "Export Options", nullptr)); + radioButton_2->setText(QApplication::translate("Form", "&DocBook", nullptr)); + radioButton->setText(QApplication::translate("Form", "&LaTeX", nullptr)); + checkBox_2->setText(QApplication::translate("Form", "Include p&ictures", nullptr)); + checkBox->setText(QApplication::translate("Form", "&Compress", nullptr)); + radioButton_2_2->setText(QApplication::translate("Form", "&HTML", nullptr)); + radioButton_3->setText(QApplication::translate("Form", "&PostScript", nullptr)); + radioButton_4->setText(QApplication::translate("Form", "PD&F", nullptr)); + checkBox_3->setText(QApplication::translate("Form", "Include &metadata", nullptr)); + checkBox_4->setText(QApplication::translate("Form", "Create inde&x", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h index 14c215c972..a2dbb6e8c2 100644 --- a/tests/auto/tools/uic/baseline/newactiondialog.ui.h +++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h @@ -162,10 +162,10 @@ public: void retranslateUi(QDialog *qdesigner_internal__NewActionDialog) { - qdesigner_internal__NewActionDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewActionDialog", "New Action...", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", Q_NULLPTR)); - label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", Q_NULLPTR)); - label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", Q_NULLPTR)); + qdesigner_internal__NewActionDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewActionDialog", "New Action...", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", nullptr)); + label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", nullptr)); + label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h index 43a7250737..85109748e4 100644 --- a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h +++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h @@ -111,9 +111,9 @@ public: void retranslateUi(QDialog *qdesigner_internal__NewDynamicPropertyDialog) { - qdesigner_internal__NewDynamicPropertyDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Create Dynamic Property", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Name", Q_NULLPTR)); - label_2->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Type", Q_NULLPTR)); + qdesigner_internal__NewDynamicPropertyDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Create Dynamic Property", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Name", nullptr)); + label_2->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Type", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newform.ui.h b/tests/auto/tools/uic/baseline/newform.ui.h index 438a537580..34b5b1a3eb 100644 --- a/tests/auto/tools/uic/baseline/newform.ui.h +++ b/tests/auto/tools/uic/baseline/newform.ui.h @@ -134,11 +134,11 @@ public: void retranslateUi(QDialog *NewForm) { - NewForm->setWindowTitle(QApplication::translate("NewForm", "New Form", Q_NULLPTR)); + NewForm->setWindowTitle(QApplication::translate("NewForm", "New Form", nullptr)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("NewForm", "0", Q_NULLPTR)); - lblPreview->setText(QApplication::translate("NewForm", "Choose a template for a preview", Q_NULLPTR)); - chkShowOnStartup->setText(QApplication::translate("NewForm", "Show this Dialog on Startup", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("NewForm", "0", nullptr)); + lblPreview->setText(QApplication::translate("NewForm", "Choose a template for a preview", nullptr)); + chkShowOnStartup->setText(QApplication::translate("NewForm", "Show this Dialog on Startup", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h index 483db65de2..eb1f90d23b 100644 --- a/tests/auto/tools/uic/baseline/orderdialog.ui.h +++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h @@ -133,13 +133,13 @@ public: void retranslateUi(QDialog *qdesigner_internal__OrderDialog) { - qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", Q_NULLPTR)); + qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", nullptr)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", nullptr)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", Q_NULLPTR)); + upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", Q_NULLPTR)); + downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", nullptr)); #endif // QT_NO_TOOLTIP } // retranslateUi diff --git a/tests/auto/tools/uic/baseline/outputpage.ui.h b/tests/auto/tools/uic/baseline/outputpage.ui.h index 6d0c392f7e..9648be0ed4 100644 --- a/tests/auto/tools/uic/baseline/outputpage.ui.h +++ b/tests/auto/tools/uic/baseline/outputpage.ui.h @@ -90,9 +90,9 @@ public: void retranslateUi(QWidget *OutputPage) { - OutputPage->setWindowTitle(QApplication::translate("OutputPage", "Form", Q_NULLPTR)); - label->setText(QApplication::translate("OutputPage", "Project file name:", Q_NULLPTR)); - label_2->setText(QApplication::translate("OutputPage", "Collection file name:", Q_NULLPTR)); + OutputPage->setWindowTitle(QApplication::translate("OutputPage", "Form", nullptr)); + label->setText(QApplication::translate("OutputPage", "Project file name:", nullptr)); + label_2->setText(QApplication::translate("OutputPage", "Collection file name:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/pagefold.ui.h b/tests/auto/tools/uic/baseline/pagefold.ui.h index 5a6277089d..255ed41400 100644 --- a/tests/auto/tools/uic/baseline/pagefold.ui.h +++ b/tests/auto/tools/uic/baseline/pagefold.ui.h @@ -244,84 +244,84 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", Q_NULLPTR)); - exitAction->setText(QApplication::translate("MainWindow", "&Exit", Q_NULLPTR)); - aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", Q_NULLPTR)); - editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", Q_NULLPTR)); - aboutAction->setText(QApplication::translate("MainWindow", "About", Q_NULLPTR)); - nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", Q_NULLPTR)); - nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", Q_NULLPTR)); - nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", Q_NULLPTR)); - nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", Q_NULLPTR)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); + exitAction->setText(QApplication::translate("MainWindow", "&Exit", nullptr)); + aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", nullptr)); + editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", nullptr)); + aboutAction->setText(QApplication::translate("MainWindow", "About", nullptr)); + nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", nullptr)); + nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", nullptr)); + nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", nullptr)); + nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", nullptr)); #ifndef QT_NO_TOOLTIP - nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", Q_NULLPTR)); + nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", nullptr)); #endif // QT_NO_TOOLTIP - femaleRadioButton->setStyleSheet(QApplication::translate("MainWindow", "Check this if you are female", Q_NULLPTR)); - femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", Q_NULLPTR)); - genderLabel->setText(QApplication::translate("MainWindow", "Gender:", Q_NULLPTR)); - ageLabel->setText(QApplication::translate("MainWindow", "&Age:", Q_NULLPTR)); + femaleRadioButton->setStyleSheet(QApplication::translate("MainWindow", "Check this if you are female", nullptr)); + femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", nullptr)); + genderLabel->setText(QApplication::translate("MainWindow", "Gender:", nullptr)); + ageLabel->setText(QApplication::translate("MainWindow", "&Age:", nullptr)); #ifndef QT_NO_TOOLTIP - maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", Q_NULLPTR)); + maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", nullptr)); #endif // QT_NO_TOOLTIP - maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", Q_NULLPTR)); - nameLabel->setText(QApplication::translate("MainWindow", "&Name:", Q_NULLPTR)); - passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", Q_NULLPTR)); + maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", nullptr)); + nameLabel->setText(QApplication::translate("MainWindow", "&Name:", nullptr)); + passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", nullptr)); #ifndef QT_NO_TOOLTIP - ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); + ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); + ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age", nullptr)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_TOOLTIP - agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the LICENSE file before checking", Q_NULLPTR)); + agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the LICENSE file before checking", nullptr)); #endif // QT_NO_TOOLTIP - agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and &conditions", Q_NULLPTR)); + agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and &conditions", nullptr)); #ifndef QT_NO_TOOLTIP - passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); + passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); + passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password", nullptr)); #endif // QT_NO_STATUSTIP - passwordEdit->setText(QApplication::translate("MainWindow", "Password", Q_NULLPTR)); + passwordEdit->setText(QApplication::translate("MainWindow", "Password", nullptr)); const bool __sortingEnabled = professionList->isSortingEnabled(); professionList->setSortingEnabled(false); QListWidgetItem *___qlistwidgetitem = professionList->item(0); - ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", Q_NULLPTR)); + ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", nullptr)); QListWidgetItem *___qlistwidgetitem1 = professionList->item(1); - ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", Q_NULLPTR)); + ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", nullptr)); QListWidgetItem *___qlistwidgetitem2 = professionList->item(2); - ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", Q_NULLPTR)); + ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", nullptr)); professionList->setSortingEnabled(__sortingEnabled); #ifndef QT_NO_TOOLTIP - professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - professionList->setStatusTip(QApplication::translate("MainWindow", "Specify your name here", Q_NULLPTR)); + professionList->setStatusTip(QApplication::translate("MainWindow", "Specify your name here", nullptr)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_WHATSTHIS - professionList->setWhatsThis(QApplication::translate("MainWindow", "Specify your name here", Q_NULLPTR)); + professionList->setWhatsThis(QApplication::translate("MainWindow", "Specify your name here", nullptr)); #endif // QT_NO_WHATSTHIS - label->setText(QApplication::translate("MainWindow", "Profession:", Q_NULLPTR)); - countryCombo->setItemText(0, QApplication::translate("MainWindow", "Egypt", Q_NULLPTR)); - countryCombo->setItemText(1, QApplication::translate("MainWindow", "France", Q_NULLPTR)); - countryCombo->setItemText(2, QApplication::translate("MainWindow", "Germany", Q_NULLPTR)); - countryCombo->setItemText(3, QApplication::translate("MainWindow", "India", Q_NULLPTR)); - countryCombo->setItemText(4, QApplication::translate("MainWindow", "Italy", Q_NULLPTR)); - countryCombo->setItemText(5, QApplication::translate("MainWindow", "Korea", Q_NULLPTR)); - countryCombo->setItemText(6, QApplication::translate("MainWindow", "Norway", Q_NULLPTR)); + label->setText(QApplication::translate("MainWindow", "Profession:", nullptr)); + countryCombo->setItemText(0, QApplication::translate("MainWindow", "Egypt", nullptr)); + countryCombo->setItemText(1, QApplication::translate("MainWindow", "France", nullptr)); + countryCombo->setItemText(2, QApplication::translate("MainWindow", "Germany", nullptr)); + countryCombo->setItemText(3, QApplication::translate("MainWindow", "India", nullptr)); + countryCombo->setItemText(4, QApplication::translate("MainWindow", "Italy", nullptr)); + countryCombo->setItemText(5, QApplication::translate("MainWindow", "Korea", nullptr)); + countryCombo->setItemText(6, QApplication::translate("MainWindow", "Norway", nullptr)); #ifndef QT_NO_TOOLTIP - countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify country of origin", Q_NULLPTR)); + countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify country of origin", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify country of origin", Q_NULLPTR)); + countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify country of origin", nullptr)); #endif // QT_NO_STATUSTIP - countryLabel->setText(QApplication::translate("MainWindow", "Pro&fession", Q_NULLPTR)); - menu_File->setTitle(QApplication::translate("MainWindow", "&File", Q_NULLPTR)); - menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", Q_NULLPTR)); + countryLabel->setText(QApplication::translate("MainWindow", "Pro&fession", nullptr)); + menu_File->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); + menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/paletteeditor.ui.h b/tests/auto/tools/uic/baseline/paletteeditor.ui.h index 17edb548ef..c91658a4bf 100644 --- a/tests/auto/tools/uic/baseline/paletteeditor.ui.h +++ b/tests/auto/tools/uic/baseline/paletteeditor.ui.h @@ -199,16 +199,16 @@ public: void retranslateUi(QDialog *qdesigner_internal__PaletteEditor) { - qdesigner_internal__PaletteEditor->setWindowTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Edit Palette", Q_NULLPTR)); - advancedBox->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Tune Palette", Q_NULLPTR)); + qdesigner_internal__PaletteEditor->setWindowTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Edit Palette", nullptr)); + advancedBox->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Tune Palette", nullptr)); buildButton->setText(QString()); - detailsRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Show Details", Q_NULLPTR)); - computeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Compute Details", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Quick", Q_NULLPTR)); - GroupBox126->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Preview", Q_NULLPTR)); - disabledRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Disabled", Q_NULLPTR)); - inactiveRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Inactive", Q_NULLPTR)); - activeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Active", Q_NULLPTR)); + detailsRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Show Details", nullptr)); + computeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Compute Details", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Quick", nullptr)); + GroupBox126->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Preview", nullptr)); + disabledRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Disabled", nullptr)); + inactiveRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Inactive", nullptr)); + activeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Active", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/passworddialog.ui.h b/tests/auto/tools/uic/baseline/passworddialog.ui.h index a9c9ed842f..9d42642b93 100644 --- a/tests/auto/tools/uic/baseline/passworddialog.ui.h +++ b/tests/auto/tools/uic/baseline/passworddialog.ui.h @@ -101,11 +101,11 @@ public: void retranslateUi(QDialog *PasswordDialog) { - PasswordDialog->setWindowTitle(QApplication::translate("PasswordDialog", "Authentication Required", Q_NULLPTR)); - iconLabel->setText(QApplication::translate("PasswordDialog", "DUMMY ICON", Q_NULLPTR)); - introLabel->setText(QApplication::translate("PasswordDialog", "INTRO TEXT DUMMY", Q_NULLPTR)); - label->setText(QApplication::translate("PasswordDialog", "Username:", Q_NULLPTR)); - lblPassword->setText(QApplication::translate("PasswordDialog", "Password:", Q_NULLPTR)); + PasswordDialog->setWindowTitle(QApplication::translate("PasswordDialog", "Authentication Required", nullptr)); + iconLabel->setText(QApplication::translate("PasswordDialog", "DUMMY ICON", nullptr)); + introLabel->setText(QApplication::translate("PasswordDialog", "INTRO TEXT DUMMY", nullptr)); + label->setText(QApplication::translate("PasswordDialog", "Username:", nullptr)); + lblPassword->setText(QApplication::translate("PasswordDialog", "Password:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/pathpage.ui.h b/tests/auto/tools/uic/baseline/pathpage.ui.h index 10a11d5fbd..49a2c56f2e 100644 --- a/tests/auto/tools/uic/baseline/pathpage.ui.h +++ b/tests/auto/tools/uic/baseline/pathpage.ui.h @@ -107,11 +107,11 @@ public: void retranslateUi(QWidget *PathPage) { - PathPage->setWindowTitle(QApplication::translate("PathPage", "Form", Q_NULLPTR)); - label_2->setText(QApplication::translate("PathPage", "File filters:", Q_NULLPTR)); - label->setText(QApplication::translate("PathPage", "Documentation source file paths:", Q_NULLPTR)); - addButton->setText(QApplication::translate("PathPage", "Add", Q_NULLPTR)); - removeButton->setText(QApplication::translate("PathPage", "Remove", Q_NULLPTR)); + PathPage->setWindowTitle(QApplication::translate("PathPage", "Form", nullptr)); + label_2->setText(QApplication::translate("PathPage", "File filters:", nullptr)); + label->setText(QApplication::translate("PathPage", "Documentation source file paths:", nullptr)); + addButton->setText(QApplication::translate("PathPage", "Add", nullptr)); + removeButton->setText(QApplication::translate("PathPage", "Remove", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h index cc8963fcae..7f2c052f63 100644 --- a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h +++ b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h @@ -186,38 +186,38 @@ public: void retranslateUi(QDialog *PhraseBookBox) { - PhraseBookBox->setWindowTitle(QApplication::translate("PhraseBookBox", "Edit Phrase Book", Q_NULLPTR)); + PhraseBookBox->setWindowTitle(QApplication::translate("PhraseBookBox", "Edit Phrase Book", nullptr)); #ifndef QT_NO_WHATSTHIS - PhraseBookBox->setWhatsThis(QApplication::translate("PhraseBookBox", "This window allows you to add, modify, or delete phrases in a phrase book.", Q_NULLPTR)); + PhraseBookBox->setWhatsThis(QApplication::translate("PhraseBookBox", "This window allows you to add, modify, or delete phrases in a phrase book.", nullptr)); #endif // QT_NO_WHATSTHIS - target->setText(QApplication::translate("PhraseBookBox", "&Translation:", Q_NULLPTR)); + target->setText(QApplication::translate("PhraseBookBox", "&Translation:", nullptr)); #ifndef QT_NO_WHATSTHIS - targetLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the target language corresponding to the source phrase.", Q_NULLPTR)); + targetLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the target language corresponding to the source phrase.", nullptr)); #endif // QT_NO_WHATSTHIS - source->setText(QApplication::translate("PhraseBookBox", "S&ource phrase:", Q_NULLPTR)); + source->setText(QApplication::translate("PhraseBookBox", "S&ource phrase:", nullptr)); #ifndef QT_NO_WHATSTHIS - definitionLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is a definition for the source phrase.", Q_NULLPTR)); + definitionLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is a definition for the source phrase.", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - sourceLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the source language.", Q_NULLPTR)); + sourceLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the source language.", nullptr)); #endif // QT_NO_WHATSTHIS - definition->setText(QApplication::translate("PhraseBookBox", "&Definition:", Q_NULLPTR)); + definition->setText(QApplication::translate("PhraseBookBox", "&Definition:", nullptr)); #ifndef QT_NO_WHATSTHIS - newBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to add the phrase to the phrase book.", Q_NULLPTR)); + newBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to add the phrase to the phrase book.", nullptr)); #endif // QT_NO_WHATSTHIS - newBut->setText(QApplication::translate("PhraseBookBox", "&New Phrase", Q_NULLPTR)); + newBut->setText(QApplication::translate("PhraseBookBox", "&New Phrase", nullptr)); #ifndef QT_NO_WHATSTHIS - removeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to remove the phrase from the phrase book.", Q_NULLPTR)); + removeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to remove the phrase from the phrase book.", nullptr)); #endif // QT_NO_WHATSTHIS - removeBut->setText(QApplication::translate("PhraseBookBox", "&Remove Phrase", Q_NULLPTR)); + removeBut->setText(QApplication::translate("PhraseBookBox", "&Remove Phrase", nullptr)); #ifndef QT_NO_WHATSTHIS - saveBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to save the changes made.", Q_NULLPTR)); + saveBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to save the changes made.", nullptr)); #endif // QT_NO_WHATSTHIS - saveBut->setText(QApplication::translate("PhraseBookBox", "&Save", Q_NULLPTR)); + saveBut->setText(QApplication::translate("PhraseBookBox", "&Save", nullptr)); #ifndef QT_NO_WHATSTHIS - closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", Q_NULLPTR)); + closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", nullptr)); #endif // QT_NO_WHATSTHIS - closeBut->setText(QApplication::translate("PhraseBookBox", "Close", Q_NULLPTR)); + closeBut->setText(QApplication::translate("PhraseBookBox", "Close", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h index d8b034b9ee..56228c0fea 100644 --- a/tests/auto/tools/uic/baseline/plugindialog.ui.h +++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h @@ -113,11 +113,11 @@ public: void retranslateUi(QDialog *PluginDialog) { - PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", Q_NULLPTR)); - label->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); + PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", nullptr)); + label->setText(QApplication::translate("PluginDialog", "TextLabel", nullptr)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", Q_NULLPTR)); - message->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", nullptr)); + message->setText(QApplication::translate("PluginDialog", "TextLabel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h index 078d13a7f5..3f7a23f970 100644 --- a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h +++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h @@ -153,11 +153,11 @@ public: void retranslateUi(QDialog *PreferencesDialog) { - PreferencesDialog->setWindowTitle(QApplication::translate("PreferencesDialog", "Preferences", Q_NULLPTR)); - m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", Q_NULLPTR)); - m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", Q_NULLPTR)); - m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", Q_NULLPTR)); - m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", Q_NULLPTR)); + PreferencesDialog->setWindowTitle(QApplication::translate("PreferencesDialog", "Preferences", nullptr)); + m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", nullptr)); + m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", nullptr)); + m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", nullptr)); + m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h index 3209e203e8..3ed75ec2b5 100644 --- a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h +++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h @@ -111,14 +111,14 @@ public: void retranslateUi(QGroupBox *PreviewConfigurationWidget) { - PreviewConfigurationWidget->setWindowTitle(QApplication::translate("PreviewConfigurationWidget", "Form", Q_NULLPTR)); - PreviewConfigurationWidget->setTitle(QApplication::translate("PreviewConfigurationWidget", "Print/Preview Configuration", Q_NULLPTR)); - m_styleLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style", Q_NULLPTR)); - m_appStyleSheetLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style sheet", Q_NULLPTR)); - m_appStyleSheetChangeButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", Q_NULLPTR)); - m_appStyleSheetClearButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", Q_NULLPTR)); - m_skinLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Device skin", Q_NULLPTR)); - m_skinRemoveButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", Q_NULLPTR)); + PreviewConfigurationWidget->setWindowTitle(QApplication::translate("PreviewConfigurationWidget", "Form", nullptr)); + PreviewConfigurationWidget->setTitle(QApplication::translate("PreviewConfigurationWidget", "Print/Preview Configuration", nullptr)); + m_styleLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style", nullptr)); + m_appStyleSheetLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style sheet", nullptr)); + m_appStyleSheetChangeButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", nullptr)); + m_appStyleSheetClearButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", nullptr)); + m_skinLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Device skin", nullptr)); + m_skinRemoveButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h index de046d575a..b379d9195f 100644 --- a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h +++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h @@ -172,11 +172,11 @@ public: void retranslateUi(QDialog *PreviewDialogBase) { - PreviewDialogBase->setWindowTitle(QApplication::translate("PreviewDialogBase", "Print Preview", Q_NULLPTR)); - label->setText(QApplication::translate("PreviewDialogBase", "&Paper Size:", Q_NULLPTR)); - label_2->setText(QApplication::translate("PreviewDialogBase", "&Orientation:", Q_NULLPTR)); + PreviewDialogBase->setWindowTitle(QApplication::translate("PreviewDialogBase", "Print Preview", nullptr)); + label->setText(QApplication::translate("PreviewDialogBase", "&Paper Size:", nullptr)); + label_2->setText(QApplication::translate("PreviewDialogBase", "&Orientation:", nullptr)); QTreeWidgetItem *___qtreewidgetitem = pageList->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewwidget.ui.h b/tests/auto/tools/uic/baseline/previewwidget.ui.h index f537924ca9..7bfcbac86a 100644 --- a/tests/auto/tools/uic/baseline/previewwidget.ui.h +++ b/tests/auto/tools/uic/baseline/previewwidget.ui.h @@ -238,18 +238,18 @@ public: void retranslateUi(QWidget *qdesigner_internal__PreviewWidget) { - qdesigner_internal__PreviewWidget->setWindowTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "Preview Window", Q_NULLPTR)); - LineEdit1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "LineEdit", Q_NULLPTR)); - ComboBox1->setItemText(0, QApplication::translate("qdesigner_internal::PreviewWidget", "ComboBox", Q_NULLPTR)); - - PushButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "PushButton", Q_NULLPTR)); - ButtonGroup2->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup2", Q_NULLPTR)); - CheckBox1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox1", Q_NULLPTR)); - CheckBox2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox2", Q_NULLPTR)); - ButtonGroup1->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup", Q_NULLPTR)); - RadioButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton1", Q_NULLPTR)); - RadioButton2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton2", Q_NULLPTR)); - RadioButton3->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton3", Q_NULLPTR)); + qdesigner_internal__PreviewWidget->setWindowTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "Preview Window", nullptr)); + LineEdit1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "LineEdit", nullptr)); + ComboBox1->setItemText(0, QApplication::translate("qdesigner_internal::PreviewWidget", "ComboBox", nullptr)); + + PushButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "PushButton", nullptr)); + ButtonGroup2->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup2", nullptr)); + CheckBox1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox1", nullptr)); + CheckBox2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox2", nullptr)); + ButtonGroup1->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup", nullptr)); + RadioButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton1", nullptr)); + RadioButton2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton2", nullptr)); + RadioButton3->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton3", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/proxy.ui.h b/tests/auto/tools/uic/baseline/proxy.ui.h index 79a33251b7..67a9ab2b35 100644 --- a/tests/auto/tools/uic/baseline/proxy.ui.h +++ b/tests/auto/tools/uic/baseline/proxy.ui.h @@ -90,11 +90,11 @@ public: void retranslateUi(QDialog *ProxyDialog) { - ProxyDialog->setWindowTitle(QApplication::translate("ProxyDialog", "Proxy Authentication", Q_NULLPTR)); - iconLabel->setText(QApplication::translate("ProxyDialog", "ICON", Q_NULLPTR)); - introLabel->setText(QApplication::translate("ProxyDialog", "Connect to proxy", Q_NULLPTR)); - usernameLabel->setText(QApplication::translate("ProxyDialog", "Username:", Q_NULLPTR)); - passwordLabel->setText(QApplication::translate("ProxyDialog", "Password:", Q_NULLPTR)); + ProxyDialog->setWindowTitle(QApplication::translate("ProxyDialog", "Proxy Authentication", nullptr)); + iconLabel->setText(QApplication::translate("ProxyDialog", "ICON", nullptr)); + introLabel->setText(QApplication::translate("ProxyDialog", "Connect to proxy", nullptr)); + usernameLabel->setText(QApplication::translate("ProxyDialog", "Username:", nullptr)); + passwordLabel->setText(QApplication::translate("ProxyDialog", "Password:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h index 24bf810f72..98b05c34b6 100644 --- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h @@ -273,26 +273,26 @@ public: void retranslateUi(QDialog *QFileDialog) { - lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", Q_NULLPTR)); + lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", nullptr)); #ifndef QT_NO_TOOLTIP - backButton->setToolTip(QApplication::translate("QFileDialog", "Back", Q_NULLPTR)); + backButton->setToolTip(QApplication::translate("QFileDialog", "Back", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", Q_NULLPTR)); + forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", Q_NULLPTR)); + toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", Q_NULLPTR)); + newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", Q_NULLPTR)); + listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", Q_NULLPTR)); + detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", nullptr)); #endif // QT_NO_TOOLTIP - fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", Q_NULLPTR)); + fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", nullptr)); Q_UNUSED(QFileDialog); } // retranslateUi diff --git a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h index d75f7f1146..b49853b1c4 100644 --- a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h +++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h @@ -307,45 +307,45 @@ public: void retranslateUi(QWidget *QPageSetupWidget) { - QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", Q_NULLPTR)); - pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", Q_NULLPTR)); - widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", Q_NULLPTR)); - heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", Q_NULLPTR)); - paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", Q_NULLPTR)); - groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", Q_NULLPTR)); - portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", Q_NULLPTR)); - landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", Q_NULLPTR)); - reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", Q_NULLPTR)); - reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", Q_NULLPTR)); + QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", nullptr)); + groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", nullptr)); + pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", nullptr)); + widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", nullptr)); + heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", nullptr)); + paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", nullptr)); + groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", nullptr)); + portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", nullptr)); + landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", nullptr)); + reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", nullptr)); + reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", nullptr)); + groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", nullptr)); #ifndef QT_NO_TOOLTIP - topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); + topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); + topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", nullptr)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); + leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); + leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", nullptr)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); + rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); + rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", nullptr)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); + bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); + bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", nullptr)); #endif // QT_NO_ACCESSIBILITY - pagesPerSheetButtonGroup->setTitle(QApplication::translate("QPageSetupWidget", "Page Layout", Q_NULLPTR)); - label->setText(QApplication::translate("QPageSetupWidget", "Page order:", Q_NULLPTR)); - label_2->setText(QApplication::translate("QPageSetupWidget", "Pages per sheet:", Q_NULLPTR)); + pagesPerSheetButtonGroup->setTitle(QApplication::translate("QPageSetupWidget", "Page Layout", nullptr)); + label->setText(QApplication::translate("QPageSetupWidget", "Page order:", nullptr)); + label_2->setText(QApplication::translate("QPageSetupWidget", "Pages per sheet:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h index dcd6ca6efd..9f1b96129e 100644 --- a/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h +++ b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h @@ -81,9 +81,9 @@ public: void retranslateUi(QWidget *QPrintPropertiesWidget) { - QPrintPropertiesWidget->setWindowTitle(QApplication::translate("QPrintPropertiesWidget", "Form", Q_NULLPTR)); - tabs->setTabText(tabs->indexOf(tabPage), QApplication::translate("QPrintPropertiesWidget", "Page", Q_NULLPTR)); - tabs->setTabText(tabs->indexOf(cupsPropertiesPage), QApplication::translate("QPrintPropertiesWidget", "Advanced", Q_NULLPTR)); + QPrintPropertiesWidget->setWindowTitle(QApplication::translate("QPrintPropertiesWidget", "Form", nullptr)); + tabs->setTabText(tabs->indexOf(tabPage), QApplication::translate("QPrintPropertiesWidget", "Page", nullptr)); + tabs->setTabText(tabs->indexOf(cupsPropertiesPage), QApplication::translate("QPrintPropertiesWidget", "Advanced", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h index a11709c014..04978f44b7 100644 --- a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h +++ b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h @@ -279,25 +279,25 @@ public: void retranslateUi(QWidget *QPrintSettingsOutput) { - QPrintSettingsOutput->setWindowTitle(QApplication::translate("QPrintSettingsOutput", "Form", Q_NULLPTR)); - gbPrintRange->setTitle(QApplication::translate("QPrintSettingsOutput", "Print range", Q_NULLPTR)); - printAll->setText(QApplication::translate("QPrintSettingsOutput", "Print all", Q_NULLPTR)); - printRange->setText(QApplication::translate("QPrintSettingsOutput", "Pages from", Q_NULLPTR)); - label_3->setText(QApplication::translate("QPrintSettingsOutput", "to", Q_NULLPTR)); - printSelection->setText(QApplication::translate("QPrintSettingsOutput", "Selection", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("QPrintSettingsOutput", "Output Settings", Q_NULLPTR)); - label->setText(QApplication::translate("QPrintSettingsOutput", "Copies:", Q_NULLPTR)); - collate->setText(QApplication::translate("QPrintSettingsOutput", "Collate", Q_NULLPTR)); - reverse->setText(QApplication::translate("QPrintSettingsOutput", "Reverse", Q_NULLPTR)); - tabs->setTabText(tabs->indexOf(copiesTab), QApplication::translate("QPrintSettingsOutput", "Copies", Q_NULLPTR)); - colorMode->setTitle(QApplication::translate("QPrintSettingsOutput", "Color Mode", Q_NULLPTR)); - color->setText(QApplication::translate("QPrintSettingsOutput", "Color", Q_NULLPTR)); - grayscale->setText(QApplication::translate("QPrintSettingsOutput", "Grayscale", Q_NULLPTR)); - duplex->setTitle(QApplication::translate("QPrintSettingsOutput", "Duplex Printing", Q_NULLPTR)); - noDuplex->setText(QApplication::translate("QPrintSettingsOutput", "None", Q_NULLPTR)); - duplexLong->setText(QApplication::translate("QPrintSettingsOutput", "Long side", Q_NULLPTR)); - duplexShort->setText(QApplication::translate("QPrintSettingsOutput", "Short side", Q_NULLPTR)); - tabs->setTabText(tabs->indexOf(optionsTab), QApplication::translate("QPrintSettingsOutput", "Options", Q_NULLPTR)); + QPrintSettingsOutput->setWindowTitle(QApplication::translate("QPrintSettingsOutput", "Form", nullptr)); + gbPrintRange->setTitle(QApplication::translate("QPrintSettingsOutput", "Print range", nullptr)); + printAll->setText(QApplication::translate("QPrintSettingsOutput", "Print all", nullptr)); + printRange->setText(QApplication::translate("QPrintSettingsOutput", "Pages from", nullptr)); + label_3->setText(QApplication::translate("QPrintSettingsOutput", "to", nullptr)); + printSelection->setText(QApplication::translate("QPrintSettingsOutput", "Selection", nullptr)); + groupBox->setTitle(QApplication::translate("QPrintSettingsOutput", "Output Settings", nullptr)); + label->setText(QApplication::translate("QPrintSettingsOutput", "Copies:", nullptr)); + collate->setText(QApplication::translate("QPrintSettingsOutput", "Collate", nullptr)); + reverse->setText(QApplication::translate("QPrintSettingsOutput", "Reverse", nullptr)); + tabs->setTabText(tabs->indexOf(copiesTab), QApplication::translate("QPrintSettingsOutput", "Copies", nullptr)); + colorMode->setTitle(QApplication::translate("QPrintSettingsOutput", "Color Mode", nullptr)); + color->setText(QApplication::translate("QPrintSettingsOutput", "Color", nullptr)); + grayscale->setText(QApplication::translate("QPrintSettingsOutput", "Grayscale", nullptr)); + duplex->setTitle(QApplication::translate("QPrintSettingsOutput", "Duplex Printing", nullptr)); + noDuplex->setText(QApplication::translate("QPrintSettingsOutput", "None", nullptr)); + duplexLong->setText(QApplication::translate("QPrintSettingsOutput", "Long side", nullptr)); + duplexShort->setText(QApplication::translate("QPrintSettingsOutput", "Short side", nullptr)); + tabs->setTabText(tabs->indexOf(optionsTab), QApplication::translate("QPrintSettingsOutput", "Options", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qprintwidget.ui.h b/tests/auto/tools/uic/baseline/qprintwidget.ui.h index 7a81f3daf5..f22d0741f2 100644 --- a/tests/auto/tools/uic/baseline/qprintwidget.ui.h +++ b/tests/auto/tools/uic/baseline/qprintwidget.ui.h @@ -143,15 +143,15 @@ public: void retranslateUi(QWidget *QPrintWidget) { - QPrintWidget->setWindowTitle(QApplication::translate("QPrintWidget", "Form", Q_NULLPTR)); - printerGroup->setTitle(QApplication::translate("QPrintWidget", "Printer", Q_NULLPTR)); - label->setText(QApplication::translate("QPrintWidget", "&Name:", Q_NULLPTR)); - properties->setText(QApplication::translate("QPrintWidget", "P&roperties", Q_NULLPTR)); - label_2->setText(QApplication::translate("QPrintWidget", "Location:", Q_NULLPTR)); - preview->setText(QApplication::translate("QPrintWidget", "Preview", Q_NULLPTR)); - label_3->setText(QApplication::translate("QPrintWidget", "Type:", Q_NULLPTR)); - lOutput->setText(QApplication::translate("QPrintWidget", "Output &file:", Q_NULLPTR)); - fileBrowser->setText(QApplication::translate("QPrintWidget", "...", Q_NULLPTR)); + QPrintWidget->setWindowTitle(QApplication::translate("QPrintWidget", "Form", nullptr)); + printerGroup->setTitle(QApplication::translate("QPrintWidget", "Printer", nullptr)); + label->setText(QApplication::translate("QPrintWidget", "&Name:", nullptr)); + properties->setText(QApplication::translate("QPrintWidget", "P&roperties", nullptr)); + label_2->setText(QApplication::translate("QPrintWidget", "Location:", nullptr)); + preview->setText(QApplication::translate("QPrintWidget", "Preview", nullptr)); + label_3->setText(QApplication::translate("QPrintWidget", "Type:", nullptr)); + lOutput->setText(QApplication::translate("QPrintWidget", "Output &file:", nullptr)); + fileBrowser->setText(QApplication::translate("QPrintWidget", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h index bffb9a1b63..e2de642905 100644 --- a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h +++ b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h @@ -209,18 +209,18 @@ public: void retranslateUi(QDialog *QSqlConnectionDialogUi) { - QSqlConnectionDialogUi->setWindowTitle(QApplication::translate("QSqlConnectionDialogUi", "Connect...", Q_NULLPTR)); - connGroupBox->setTitle(QApplication::translate("QSqlConnectionDialogUi", "Connection settings", Q_NULLPTR)); - textLabel4->setText(QApplication::translate("QSqlConnectionDialogUi", "&Username:", Q_NULLPTR)); - textLabel2->setText(QApplication::translate("QSqlConnectionDialogUi", "D&river", Q_NULLPTR)); - portSpinBox->setSpecialValueText(QApplication::translate("QSqlConnectionDialogUi", "Default", Q_NULLPTR)); - textLabel3->setText(QApplication::translate("QSqlConnectionDialogUi", "Database Name:", Q_NULLPTR)); - textLabel5->setText(QApplication::translate("QSqlConnectionDialogUi", "&Hostname:", Q_NULLPTR)); - textLabel5_2->setText(QApplication::translate("QSqlConnectionDialogUi", "P&ort:", Q_NULLPTR)); - textLabel4_2->setText(QApplication::translate("QSqlConnectionDialogUi", "&Password:", Q_NULLPTR)); - dbCheckBox->setText(QApplication::translate("QSqlConnectionDialogUi", "Us&e predefined in-memory database", Q_NULLPTR)); - okButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&OK", Q_NULLPTR)); - cancelButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&Cancel", Q_NULLPTR)); + QSqlConnectionDialogUi->setWindowTitle(QApplication::translate("QSqlConnectionDialogUi", "Connect...", nullptr)); + connGroupBox->setTitle(QApplication::translate("QSqlConnectionDialogUi", "Connection settings", nullptr)); + textLabel4->setText(QApplication::translate("QSqlConnectionDialogUi", "&Username:", nullptr)); + textLabel2->setText(QApplication::translate("QSqlConnectionDialogUi", "D&river", nullptr)); + portSpinBox->setSpecialValueText(QApplication::translate("QSqlConnectionDialogUi", "Default", nullptr)); + textLabel3->setText(QApplication::translate("QSqlConnectionDialogUi", "Database Name:", nullptr)); + textLabel5->setText(QApplication::translate("QSqlConnectionDialogUi", "&Hostname:", nullptr)); + textLabel5_2->setText(QApplication::translate("QSqlConnectionDialogUi", "P&ort:", nullptr)); + textLabel4_2->setText(QApplication::translate("QSqlConnectionDialogUi", "&Password:", nullptr)); + dbCheckBox->setText(QApplication::translate("QSqlConnectionDialogUi", "Us&e predefined in-memory database", nullptr)); + okButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&OK", nullptr)); + cancelButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h index a4599607b8..9da153f156 100644 --- a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h @@ -92,7 +92,7 @@ public: void retranslateUi(QDialog *QtGradientDialog) { - QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", Q_NULLPTR)); + QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h index 8b7a4c1293..76e0001e16 100644 --- a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h @@ -586,119 +586,119 @@ public: void retranslateUi(QWidget *QtGradientEditor) { - QtGradientEditor->setWindowTitle(QApplication::translate("QtGradientEditor", "Form", Q_NULLPTR)); + QtGradientEditor->setWindowTitle(QApplication::translate("QtGradientEditor", "Form", nullptr)); #ifndef QT_NO_TOOLTIP - gradientWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Editor", Q_NULLPTR)); + gradientWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Editor", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - gradientWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.", Q_NULLPTR)); + gradientWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.", nullptr)); #endif // QT_NO_WHATSTHIS - label1->setText(QApplication::translate("QtGradientEditor", "1", Q_NULLPTR)); - label2->setText(QApplication::translate("QtGradientEditor", "2", Q_NULLPTR)); - label3->setText(QApplication::translate("QtGradientEditor", "3", Q_NULLPTR)); - label4->setText(QApplication::translate("QtGradientEditor", "4", Q_NULLPTR)); - label5->setText(QApplication::translate("QtGradientEditor", "5", Q_NULLPTR)); + label1->setText(QApplication::translate("QtGradientEditor", "1", nullptr)); + label2->setText(QApplication::translate("QtGradientEditor", "2", nullptr)); + label3->setText(QApplication::translate("QtGradientEditor", "3", nullptr)); + label4->setText(QApplication::translate("QtGradientEditor", "4", nullptr)); + label5->setText(QApplication::translate("QtGradientEditor", "5", nullptr)); #ifndef QT_NO_TOOLTIP - gradientStopsWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Stops Editor", Q_NULLPTR)); + gradientStopsWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Stops Editor", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - gradientStopsWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.", Q_NULLPTR)); + gradientStopsWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.", nullptr)); #endif // QT_NO_WHATSTHIS - zoomLabel->setText(QApplication::translate("QtGradientEditor", "Zoom", Q_NULLPTR)); + zoomLabel->setText(QApplication::translate("QtGradientEditor", "Zoom", nullptr)); #ifndef QT_NO_TOOLTIP - zoomAllButton->setToolTip(QApplication::translate("QtGradientEditor", "Reset Zoom", Q_NULLPTR)); + zoomAllButton->setToolTip(QApplication::translate("QtGradientEditor", "Reset Zoom", nullptr)); #endif // QT_NO_TOOLTIP - zoomAllButton->setText(QApplication::translate("QtGradientEditor", "Reset Zoom", Q_NULLPTR)); - positionLabel->setText(QApplication::translate("QtGradientEditor", "Position", Q_NULLPTR)); + zoomAllButton->setText(QApplication::translate("QtGradientEditor", "Reset Zoom", nullptr)); + positionLabel->setText(QApplication::translate("QtGradientEditor", "Position", nullptr)); #ifndef QT_NO_TOOLTIP - hLabel->setToolTip(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); + hLabel->setToolTip(QApplication::translate("QtGradientEditor", "Hue", nullptr)); #endif // QT_NO_TOOLTIP - hLabel->setText(QApplication::translate("QtGradientEditor", "H", Q_NULLPTR)); + hLabel->setText(QApplication::translate("QtGradientEditor", "H", nullptr)); #ifndef QT_NO_TOOLTIP - hueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); + hueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Hue", nullptr)); #endif // QT_NO_TOOLTIP - hueLabel->setText(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); + hueLabel->setText(QApplication::translate("QtGradientEditor", "Hue", nullptr)); #ifndef QT_NO_TOOLTIP - sLabel->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", Q_NULLPTR)); + sLabel->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", nullptr)); #endif // QT_NO_TOOLTIP - sLabel->setText(QApplication::translate("QtGradientEditor", "S", Q_NULLPTR)); + sLabel->setText(QApplication::translate("QtGradientEditor", "S", nullptr)); #ifndef QT_NO_TOOLTIP - saturationColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", Q_NULLPTR)); + saturationColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", nullptr)); #endif // QT_NO_TOOLTIP - saturationLabel->setText(QApplication::translate("QtGradientEditor", "Sat", Q_NULLPTR)); + saturationLabel->setText(QApplication::translate("QtGradientEditor", "Sat", nullptr)); #ifndef QT_NO_TOOLTIP - vLabel->setToolTip(QApplication::translate("QtGradientEditor", "Value", Q_NULLPTR)); + vLabel->setToolTip(QApplication::translate("QtGradientEditor", "Value", nullptr)); #endif // QT_NO_TOOLTIP - vLabel->setText(QApplication::translate("QtGradientEditor", "V", Q_NULLPTR)); + vLabel->setText(QApplication::translate("QtGradientEditor", "V", nullptr)); #ifndef QT_NO_TOOLTIP - valueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Value", Q_NULLPTR)); + valueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Value", nullptr)); #endif // QT_NO_TOOLTIP - valueLabel->setText(QApplication::translate("QtGradientEditor", "Val", Q_NULLPTR)); + valueLabel->setText(QApplication::translate("QtGradientEditor", "Val", nullptr)); #ifndef QT_NO_TOOLTIP - aLabel->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); + aLabel->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", nullptr)); #endif // QT_NO_TOOLTIP - aLabel->setText(QApplication::translate("QtGradientEditor", "A", Q_NULLPTR)); + aLabel->setText(QApplication::translate("QtGradientEditor", "A", nullptr)); #ifndef QT_NO_TOOLTIP - alphaColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); + alphaColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", nullptr)); #endif // QT_NO_TOOLTIP - alphaLabel->setText(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); + alphaLabel->setText(QApplication::translate("QtGradientEditor", "Alpha", nullptr)); #ifndef QT_NO_TOOLTIP - typeComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Type", Q_NULLPTR)); + typeComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Type", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - spreadComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Spread", Q_NULLPTR)); + spreadComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Spread", nullptr)); #endif // QT_NO_TOOLTIP - colorLabel->setText(QApplication::translate("QtGradientEditor", "Color", Q_NULLPTR)); + colorLabel->setText(QApplication::translate("QtGradientEditor", "Color", nullptr)); #ifndef QT_NO_TOOLTIP - colorButton->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's color", Q_NULLPTR)); + colorButton->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's color", nullptr)); #endif // QT_NO_TOOLTIP colorButton->setText(QString()); #ifndef QT_NO_TOOLTIP - hsvRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show HSV specification", Q_NULLPTR)); + hsvRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show HSV specification", nullptr)); #endif // QT_NO_TOOLTIP - hsvRadioButton->setText(QApplication::translate("QtGradientEditor", "HSV", Q_NULLPTR)); + hsvRadioButton->setText(QApplication::translate("QtGradientEditor", "HSV", nullptr)); #ifndef QT_NO_TOOLTIP - rgbRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show RGB specification", Q_NULLPTR)); + rgbRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show RGB specification", nullptr)); #endif // QT_NO_TOOLTIP - rgbRadioButton->setText(QApplication::translate("QtGradientEditor", "RGB", Q_NULLPTR)); + rgbRadioButton->setText(QApplication::translate("QtGradientEditor", "RGB", nullptr)); #ifndef QT_NO_TOOLTIP - positionSpinBox->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's position", Q_NULLPTR)); + positionSpinBox->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's position", nullptr)); #endif // QT_NO_TOOLTIP - zoomSpinBox->setSuffix(QApplication::translate("QtGradientEditor", "%", Q_NULLPTR)); + zoomSpinBox->setSuffix(QApplication::translate("QtGradientEditor", "%", nullptr)); #ifndef QT_NO_TOOLTIP - zoomInButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom In", Q_NULLPTR)); + zoomInButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom In", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - zoomOutButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom Out", Q_NULLPTR)); + zoomOutButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom Out", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailsButton->setToolTip(QApplication::translate("QtGradientEditor", "Toggle details extension", Q_NULLPTR)); + detailsButton->setToolTip(QApplication::translate("QtGradientEditor", "Toggle details extension", nullptr)); #endif // QT_NO_TOOLTIP - detailsButton->setText(QApplication::translate("QtGradientEditor", ">", Q_NULLPTR)); + detailsButton->setText(QApplication::translate("QtGradientEditor", ">", nullptr)); #ifndef QT_NO_TOOLTIP - linearButton->setToolTip(QApplication::translate("QtGradientEditor", "Linear Type", Q_NULLPTR)); + linearButton->setToolTip(QApplication::translate("QtGradientEditor", "Linear Type", nullptr)); #endif // QT_NO_TOOLTIP - linearButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + linearButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); #ifndef QT_NO_TOOLTIP - radialButton->setToolTip(QApplication::translate("QtGradientEditor", "Radial Type", Q_NULLPTR)); + radialButton->setToolTip(QApplication::translate("QtGradientEditor", "Radial Type", nullptr)); #endif // QT_NO_TOOLTIP - radialButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + radialButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); #ifndef QT_NO_TOOLTIP - conicalButton->setToolTip(QApplication::translate("QtGradientEditor", "Conical Type", Q_NULLPTR)); + conicalButton->setToolTip(QApplication::translate("QtGradientEditor", "Conical Type", nullptr)); #endif // QT_NO_TOOLTIP - conicalButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + conicalButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); #ifndef QT_NO_TOOLTIP - padButton->setToolTip(QApplication::translate("QtGradientEditor", "Pad Spread", Q_NULLPTR)); + padButton->setToolTip(QApplication::translate("QtGradientEditor", "Pad Spread", nullptr)); #endif // QT_NO_TOOLTIP - padButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + padButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); #ifndef QT_NO_TOOLTIP - repeatButton->setToolTip(QApplication::translate("QtGradientEditor", "Repeat Spread", Q_NULLPTR)); + repeatButton->setToolTip(QApplication::translate("QtGradientEditor", "Repeat Spread", nullptr)); #endif // QT_NO_TOOLTIP - repeatButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + repeatButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); #ifndef QT_NO_TOOLTIP - reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", Q_NULLPTR)); + reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", nullptr)); #endif // QT_NO_TOOLTIP - reflectButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); + reflectButton->setText(QApplication::translate("QtGradientEditor", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientview.ui.h b/tests/auto/tools/uic/baseline/qtgradientview.ui.h index 14cb1da6b2..8b1fe38cfc 100644 --- a/tests/auto/tools/uic/baseline/qtgradientview.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientview.ui.h @@ -108,11 +108,11 @@ public: void retranslateUi(QWidget *QtGradientView) { - QtGradientView->setWindowTitle(QApplication::translate("QtGradientView", "Gradient View", Q_NULLPTR)); - newButton->setText(QApplication::translate("QtGradientView", "New...", Q_NULLPTR)); - editButton->setText(QApplication::translate("QtGradientView", "Edit...", Q_NULLPTR)); - renameButton->setText(QApplication::translate("QtGradientView", "Rename", Q_NULLPTR)); - removeButton->setText(QApplication::translate("QtGradientView", "Remove", Q_NULLPTR)); + QtGradientView->setWindowTitle(QApplication::translate("QtGradientView", "Gradient View", nullptr)); + newButton->setText(QApplication::translate("QtGradientView", "New...", nullptr)); + editButton->setText(QApplication::translate("QtGradientView", "Edit...", nullptr)); + renameButton->setText(QApplication::translate("QtGradientView", "Rename", nullptr)); + removeButton->setText(QApplication::translate("QtGradientView", "Remove", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h index e2f8a3da03..ab90939445 100644 --- a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h @@ -92,7 +92,7 @@ public: void retranslateUi(QDialog *QtGradientViewDialog) { - QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", Q_NULLPTR)); + QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h index 50c844cf35..604cbdaf9d 100644 --- a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h @@ -143,25 +143,25 @@ public: void retranslateUi(QDialog *QtResourceEditorDialog) { - QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", Q_NULLPTR)); + QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", nullptr)); #ifndef QT_NO_TOOLTIP - newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", Q_NULLPTR)); + newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", nullptr)); #endif // QT_NO_TOOLTIP - newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR)); + newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", nullptr)); #ifndef QT_NO_TOOLTIP - removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", Q_NULLPTR)); + removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", nullptr)); #endif // QT_NO_TOOLTIP - removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR)); - importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", Q_NULLPTR)); + removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", nullptr)); + importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", nullptr)); #ifndef QT_NO_TOOLTIP - newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", Q_NULLPTR)); + newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", nullptr)); #endif // QT_NO_TOOLTIP - newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR)); - addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", Q_NULLPTR)); + newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", nullptr)); + addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", nullptr)); #ifndef QT_NO_TOOLTIP - removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", Q_NULLPTR)); + removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", nullptr)); #endif // QT_NO_TOOLTIP - removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR)); + removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h index 6694cf4ccd..f329cc2b8b 100644 --- a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h +++ b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h @@ -180,40 +180,40 @@ public: void retranslateUi(QDialog *QtToolBarDialog) { - QtToolBarDialog->setWindowTitle(QApplication::translate("QtToolBarDialog", "Customize Toolbars", Q_NULLPTR)); + QtToolBarDialog->setWindowTitle(QApplication::translate("QtToolBarDialog", "Customize Toolbars", nullptr)); QTreeWidgetItem *___qtreewidgetitem = actionTree->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("QtToolBarDialog", "1", Q_NULLPTR)); - label->setText(QApplication::translate("QtToolBarDialog", "Actions", Q_NULLPTR)); - label_2->setText(QApplication::translate("QtToolBarDialog", "Toolbars", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("QtToolBarDialog", "1", nullptr)); + label->setText(QApplication::translate("QtToolBarDialog", "Actions", nullptr)); + label_2->setText(QApplication::translate("QtToolBarDialog", "Toolbars", nullptr)); #ifndef QT_NO_TOOLTIP - newButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add new toolbar", Q_NULLPTR)); + newButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add new toolbar", nullptr)); #endif // QT_NO_TOOLTIP - newButton->setText(QApplication::translate("QtToolBarDialog", "New", Q_NULLPTR)); + newButton->setText(QApplication::translate("QtToolBarDialog", "New", nullptr)); #ifndef QT_NO_TOOLTIP - removeButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove selected toolbar", Q_NULLPTR)); + removeButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove selected toolbar", nullptr)); #endif // QT_NO_TOOLTIP - removeButton->setText(QApplication::translate("QtToolBarDialog", "Remove", Q_NULLPTR)); + removeButton->setText(QApplication::translate("QtToolBarDialog", "Remove", nullptr)); #ifndef QT_NO_TOOLTIP - renameButton->setToolTip(QApplication::translate("QtToolBarDialog", "Rename toolbar", Q_NULLPTR)); + renameButton->setToolTip(QApplication::translate("QtToolBarDialog", "Rename toolbar", nullptr)); #endif // QT_NO_TOOLTIP - renameButton->setText(QApplication::translate("QtToolBarDialog", "Rename", Q_NULLPTR)); + renameButton->setText(QApplication::translate("QtToolBarDialog", "Rename", nullptr)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action up", Q_NULLPTR)); + upButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action up", nullptr)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("QtToolBarDialog", "Up", Q_NULLPTR)); + upButton->setText(QApplication::translate("QtToolBarDialog", "Up", nullptr)); #ifndef QT_NO_TOOLTIP - leftButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove action from toolbar", Q_NULLPTR)); + leftButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove action from toolbar", nullptr)); #endif // QT_NO_TOOLTIP - leftButton->setText(QApplication::translate("QtToolBarDialog", "<-", Q_NULLPTR)); + leftButton->setText(QApplication::translate("QtToolBarDialog", "<-", nullptr)); #ifndef QT_NO_TOOLTIP - rightButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add action to toolbar", Q_NULLPTR)); + rightButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add action to toolbar", nullptr)); #endif // QT_NO_TOOLTIP - rightButton->setText(QApplication::translate("QtToolBarDialog", "->", Q_NULLPTR)); + rightButton->setText(QApplication::translate("QtToolBarDialog", "->", nullptr)); #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action down", Q_NULLPTR)); + downButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action down", nullptr)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("QtToolBarDialog", "Down", Q_NULLPTR)); - label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", Q_NULLPTR)); + downButton->setText(QApplication::translate("QtToolBarDialog", "Down", nullptr)); + label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/querywidget.ui.h b/tests/auto/tools/uic/baseline/querywidget.ui.h index 531df0d614..092259784b 100644 --- a/tests/auto/tools/uic/baseline/querywidget.ui.h +++ b/tests/auto/tools/uic/baseline/querywidget.ui.h @@ -156,10 +156,10 @@ public: void retranslateUi(QMainWindow *QueryWidget) { - QueryWidget->setWindowTitle(QApplication::translate("QueryWidget", "Recipes XQuery Example", Q_NULLPTR)); - inputGroupBox->setTitle(QApplication::translate("QueryWidget", "Input Document", Q_NULLPTR)); - queryGroupBox->setTitle(QApplication::translate("QueryWidget", "Select your query:", Q_NULLPTR)); - outputGroupBox->setTitle(QApplication::translate("QueryWidget", "Output Document", Q_NULLPTR)); + QueryWidget->setWindowTitle(QApplication::translate("QueryWidget", "Recipes XQuery Example", nullptr)); + inputGroupBox->setTitle(QApplication::translate("QueryWidget", "Input Document", nullptr)); + queryGroupBox->setTitle(QApplication::translate("QueryWidget", "Select your query:", nullptr)); + outputGroupBox->setTitle(QApplication::translate("QueryWidget", "Output Document", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h index 00af983ed7..c1a8f8ae1c 100644 --- a/tests/auto/tools/uic/baseline/remotecontrol.ui.h +++ b/tests/auto/tools/uic/baseline/remotecontrol.ui.h @@ -223,22 +223,22 @@ public: void retranslateUi(QMainWindow *RemoteControlClass) { - RemoteControlClass->setWindowTitle(QApplication::translate("RemoteControlClass", "RemoteControl", Q_NULLPTR)); - actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", Q_NULLPTR)); - label->setText(QApplication::translate("RemoteControlClass", "Start URL:", Q_NULLPTR)); - launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", Q_NULLPTR)); - actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", Q_NULLPTR)); - label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", Q_NULLPTR)); + RemoteControlClass->setWindowTitle(QApplication::translate("RemoteControlClass", "RemoteControl", nullptr)); + actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", nullptr)); + label->setText(QApplication::translate("RemoteControlClass", "Start URL:", nullptr)); + launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", nullptr)); + actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", nullptr)); + label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", nullptr)); indexButton->setText(QString()); - label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", Q_NULLPTR)); + label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", nullptr)); identifierButton->setText(QString()); - label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", Q_NULLPTR)); + label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", nullptr)); urlButton->setText(QString()); - syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", Q_NULLPTR)); - contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", Q_NULLPTR)); - indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", Q_NULLPTR)); - bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", Q_NULLPTR)); - menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", Q_NULLPTR)); + syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", nullptr)); + contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", nullptr)); + indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", nullptr)); + bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", nullptr)); + menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h index 953bb211a9..ba458e5ac7 100644 --- a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h +++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h @@ -134,10 +134,10 @@ public: void retranslateUi(QDialog *SaveFormAsTemplate) { - SaveFormAsTemplate->setWindowTitle(QApplication::translate("SaveFormAsTemplate", "Save Form As Template", Q_NULLPTR)); - label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", Q_NULLPTR)); + SaveFormAsTemplate->setWindowTitle(QApplication::translate("SaveFormAsTemplate", "Save Form As Template", nullptr)); + label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", nullptr)); templateNameEdit->setText(QString()); - label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", Q_NULLPTR)); + label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h index 7342810462..e2ab074a46 100644 --- a/tests/auto/tools/uic/baseline/settings.ui.h +++ b/tests/auto/tools/uic/baseline/settings.ui.h @@ -185,13 +185,13 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); - label->setText(QApplication::translate("Dialog", "Audio device:", Q_NULLPTR)); - label_6->setText(QApplication::translate("Dialog", "Audio effect:", Q_NULLPTR)); - crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", Q_NULLPTR)); - label_3->setText(QApplication::translate("Dialog", "-10 Sec", Q_NULLPTR)); - label_5->setText(QApplication::translate("Dialog", "0", Q_NULLPTR)); - label_4->setText(QApplication::translate("Dialog", "10 Sec", Q_NULLPTR)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr)); + label->setText(QApplication::translate("Dialog", "Audio device:", nullptr)); + label_6->setText(QApplication::translate("Dialog", "Audio effect:", nullptr)); + crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", nullptr)); + label_3->setText(QApplication::translate("Dialog", "-10 Sec", nullptr)); + label_5->setText(QApplication::translate("Dialog", "0", nullptr)); + label_4->setText(QApplication::translate("Dialog", "10 Sec", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h index 5c1483c651..9063482969 100644 --- a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h +++ b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h @@ -136,25 +136,25 @@ public: void retranslateUi(QDialog *SignalSlotDialogClass) { - SignalSlotDialogClass->setWindowTitle(QApplication::translate("SignalSlotDialogClass", "Signals and slots", Q_NULLPTR)); - slotGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Slots", Q_NULLPTR)); + SignalSlotDialogClass->setWindowTitle(QApplication::translate("SignalSlotDialogClass", "Signals and slots", nullptr)); + slotGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Slots", nullptr)); #ifndef QT_NO_TOOLTIP - addSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", Q_NULLPTR)); + addSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", nullptr)); #endif // QT_NO_TOOLTIP - addSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); + addSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", nullptr)); #ifndef QT_NO_TOOLTIP - removeSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", Q_NULLPTR)); + removeSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", nullptr)); #endif // QT_NO_TOOLTIP - removeSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); - signalGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Signals", Q_NULLPTR)); + removeSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", nullptr)); + signalGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Signals", nullptr)); #ifndef QT_NO_TOOLTIP - addSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", Q_NULLPTR)); + addSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", nullptr)); #endif // QT_NO_TOOLTIP - addSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); + addSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", nullptr)); #ifndef QT_NO_TOOLTIP - removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", Q_NULLPTR)); + removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", nullptr)); #endif // QT_NO_TOOLTIP - removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); + removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h index 7c8676eec7..ad3b5b99e4 100644 --- a/tests/auto/tools/uic/baseline/sslclient.ui.h +++ b/tests/auto/tools/uic/baseline/sslclient.ui.h @@ -158,20 +158,20 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Secure Socket Client", Q_NULLPTR)); - hostNameLabel->setText(QApplication::translate("Form", "Host name:", Q_NULLPTR)); - hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", Q_NULLPTR)); - portLabel->setText(QApplication::translate("Form", "Port:", Q_NULLPTR)); - connectButton->setText(QApplication::translate("Form", "Connect to host", Q_NULLPTR)); - sessionBox->setTitle(QApplication::translate("Form", "Active session", Q_NULLPTR)); - cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", Q_NULLPTR)); - cipherLabel->setText(QApplication::translate("Form", "<none>", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Secure Socket Client", nullptr)); + hostNameLabel->setText(QApplication::translate("Form", "Host name:", nullptr)); + hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", nullptr)); + portLabel->setText(QApplication::translate("Form", "Port:", nullptr)); + connectButton->setText(QApplication::translate("Form", "Connect to host", nullptr)); + sessionBox->setTitle(QApplication::translate("Form", "Active session", nullptr)); + cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", nullptr)); + cipherLabel->setText(QApplication::translate("Form", "<none>", nullptr)); sessionOutput->setHtml(QApplication::translate("Form", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>", Q_NULLPTR)); - sessionInputLabel->setText(QApplication::translate("Form", "Input:", Q_NULLPTR)); - sendButton->setText(QApplication::translate("Form", "&Send", Q_NULLPTR)); +"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>", nullptr)); + sessionInputLabel->setText(QApplication::translate("Form", "Input:", nullptr)); + sendButton->setText(QApplication::translate("Form", "&Send", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/sslerrors.ui.h b/tests/auto/tools/uic/baseline/sslerrors.ui.h index 0149eee45a..246d622632 100644 --- a/tests/auto/tools/uic/baseline/sslerrors.ui.h +++ b/tests/auto/tools/uic/baseline/sslerrors.ui.h @@ -89,14 +89,14 @@ public: void retranslateUi(QDialog *SslErrors) { - SslErrors->setWindowTitle(QApplication::translate("SslErrors", "Unable To Validate The Connection", Q_NULLPTR)); + SslErrors->setWindowTitle(QApplication::translate("SslErrors", "Unable To Validate The Connection", nullptr)); label->setText(QApplication::translate("SslErrors", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; color:#ff0000;\">Warning</span><span style=\" color:#ff0000;\">:</span><span style=\" color:#000000;\"> One or more errors with this connection prevent validating the authenticity of the host you are connecting to. Please review the following list of errors, and click </span><span style=\" color:#000000;\">Ignore</span><span style=\" color:#000000;\"> to continue, or </span><span style=\" color:#000000;\">Cancel</span><span style=\" color:#000000;\"> to abort the connection.</span></p></body></html>", Q_NULLPTR)); - certificateChainButton->setText(QApplication::translate("SslErrors", "View Certificate Chain", Q_NULLPTR)); - pushButton->setText(QApplication::translate("SslErrors", "Ignore", Q_NULLPTR)); - pushButton_2->setText(QApplication::translate("SslErrors", "Cancel", Q_NULLPTR)); +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; color:#ff0000;\">Warning</span><span style=\" color:#ff0000;\">:</span><span style=\" color:#000000;\"> One or more errors with this connection prevent validating the authenticity of the host you are connecting to. Please review the following list of errors, and click </span><span style=\" color:#000000;\">Ignore</span><span style=\" color:#000000;\"> to continue, or </span><span style=\" color:#000000;\">Cancel</span><span style=\" color:#000000;\"> to abort the connection.</span></p></body></html>", nullptr)); + certificateChainButton->setText(QApplication::translate("SslErrors", "View Certificate Chain", nullptr)); + pushButton->setText(QApplication::translate("SslErrors", "Ignore", nullptr)); + pushButton_2->setText(QApplication::translate("SslErrors", "Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/statistics.ui.h b/tests/auto/tools/uic/baseline/statistics.ui.h index 8bcdd8b6d8..fb47be7135 100644 --- a/tests/auto/tools/uic/baseline/statistics.ui.h +++ b/tests/auto/tools/uic/baseline/statistics.ui.h @@ -182,19 +182,19 @@ public: void retranslateUi(QDialog *Statistics) { - Statistics->setWindowTitle(QApplication::translate("Statistics", "Statistics", Q_NULLPTR)); - closeBtn->setText(QApplication::translate("Statistics", "&Close", Q_NULLPTR)); - textLabel4->setText(QApplication::translate("Statistics", "Translation", Q_NULLPTR)); - textLabel5->setText(QApplication::translate("Statistics", "Source", Q_NULLPTR)); - untrWords->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); - trWords->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); - textLabel1->setText(QApplication::translate("Statistics", "Words:", Q_NULLPTR)); - trChars->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); - untrChars->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); - textLabel3->setText(QApplication::translate("Statistics", "Characters:", Q_NULLPTR)); - textLabel6->setText(QApplication::translate("Statistics", "Characters (with spaces):", Q_NULLPTR)); - trCharsSpc->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); - untrCharsSpc->setText(QApplication::translate("Statistics", "0", Q_NULLPTR)); + Statistics->setWindowTitle(QApplication::translate("Statistics", "Statistics", nullptr)); + closeBtn->setText(QApplication::translate("Statistics", "&Close", nullptr)); + textLabel4->setText(QApplication::translate("Statistics", "Translation", nullptr)); + textLabel5->setText(QApplication::translate("Statistics", "Source", nullptr)); + untrWords->setText(QApplication::translate("Statistics", "0", nullptr)); + trWords->setText(QApplication::translate("Statistics", "0", nullptr)); + textLabel1->setText(QApplication::translate("Statistics", "Words:", nullptr)); + trChars->setText(QApplication::translate("Statistics", "0", nullptr)); + untrChars->setText(QApplication::translate("Statistics", "0", nullptr)); + textLabel3->setText(QApplication::translate("Statistics", "Characters:", nullptr)); + textLabel6->setText(QApplication::translate("Statistics", "Characters (with spaces):", nullptr)); + trCharsSpc->setText(QApplication::translate("Statistics", "0", nullptr)); + untrCharsSpc->setText(QApplication::translate("Statistics", "0", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h index 2dba42b4d5..96b6df74ea 100644 --- a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h @@ -217,25 +217,25 @@ public: void retranslateUi(QDialog *qdesigner_internal__Dialog) { - qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", Q_NULLPTR)); + qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", nullptr)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", nullptr)); #ifndef QT_NO_TOOLTIP - newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", Q_NULLPTR)); + newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", nullptr)); #endif // QT_NO_TOOLTIP - newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", Q_NULLPTR)); + newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", nullptr)); #ifndef QT_NO_TOOLTIP - deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", Q_NULLPTR)); + deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", nullptr)); #endif // QT_NO_TOOLTIP - deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", Q_NULLPTR)); + deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", nullptr)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", Q_NULLPTR)); + upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", nullptr)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", Q_NULLPTR)); + upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", nullptr)); #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", Q_NULLPTR)); + downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", nullptr)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", Q_NULLPTR)); + downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h index d7b6f38d1e..539d6fdab9 100644 --- a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h @@ -133,14 +133,14 @@ public: void retranslateUi(QWidget *StyleSheetEditor) { - StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", Q_NULLPTR)); - styleSheetCombo->setItemText(0, QApplication::translate("StyleSheetEditor", "Default", Q_NULLPTR)); - styleSheetCombo->setItemText(1, QApplication::translate("StyleSheetEditor", "Coffee", Q_NULLPTR)); - styleSheetCombo->setItemText(2, QApplication::translate("StyleSheetEditor", "Pagefold", Q_NULLPTR)); - - label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", Q_NULLPTR)); - applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", Q_NULLPTR)); - label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", Q_NULLPTR)); + StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", nullptr)); + styleSheetCombo->setItemText(0, QApplication::translate("StyleSheetEditor", "Default", nullptr)); + styleSheetCombo->setItemText(1, QApplication::translate("StyleSheetEditor", "Coffee", nullptr)); + styleSheetCombo->setItemText(2, QApplication::translate("StyleSheetEditor", "Pagefold", nullptr)); + + label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", nullptr)); + applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", nullptr)); + label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h index acf0ddaef4..869e33c3aa 100644 --- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h +++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h @@ -183,14 +183,14 @@ public: void retranslateUi(QWidget *TabbedBrowser) { - TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", Q_NULLPTR)); - tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", Q_NULLPTR)); + TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", nullptr)); + tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", nullptr)); toolClose->setText(QString()); - toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", Q_NULLPTR)); - toolNext->setText(QApplication::translate("TabbedBrowser", "Next", Q_NULLPTR)); - checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", Q_NULLPTR)); - checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", Q_NULLPTR)); - labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\"> Search wrapped", Q_NULLPTR)); + toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", nullptr)); + toolNext->setText(QApplication::translate("TabbedBrowser", "Next", nullptr)); + checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", nullptr)); + checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", nullptr)); + labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\"> Search wrapped", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h index 51c053a9c1..5c39ab4444 100644 --- a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h @@ -313,54 +313,54 @@ public: void retranslateUi(QDialog *qdesigner_internal__TableWidgetEditor) { - qdesigner_internal__TableWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Edit Table Widget", Q_NULLPTR)); - itemsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", Q_NULLPTR)); + qdesigner_internal__TableWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Edit Table Widget", nullptr)); + itemsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", nullptr)); #ifndef QT_NO_TOOLTIP - tableWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", Q_NULLPTR)); + tableWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", nullptr)); #endif // QT_NO_TOOLTIP - label_3->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", Q_NULLPTR)); - columnsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Columns", Q_NULLPTR)); + label_3->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", nullptr)); + columnsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Columns", nullptr)); #ifndef QT_NO_TOOLTIP - columnsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Columns", Q_NULLPTR)); + columnsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Columns", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Column", Q_NULLPTR)); + newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Column", nullptr)); #endif // QT_NO_TOOLTIP - newColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", Q_NULLPTR)); + newColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", nullptr)); #ifndef QT_NO_TOOLTIP - deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Column", Q_NULLPTR)); + deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Column", nullptr)); #endif // QT_NO_TOOLTIP - deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", Q_NULLPTR)); + deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", nullptr)); #ifndef QT_NO_TOOLTIP - moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Up", Q_NULLPTR)); + moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Up", nullptr)); #endif // QT_NO_TOOLTIP - moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", Q_NULLPTR)); + moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", nullptr)); #ifndef QT_NO_TOOLTIP - moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Down", Q_NULLPTR)); + moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Down", nullptr)); #endif // QT_NO_TOOLTIP - moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", Q_NULLPTR)); - rowsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Rows", Q_NULLPTR)); + moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", nullptr)); + rowsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Rows", nullptr)); #ifndef QT_NO_TOOLTIP - rowsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Rows", Q_NULLPTR)); + rowsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Rows", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Row", Q_NULLPTR)); + newRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Row", nullptr)); #endif // QT_NO_TOOLTIP - newRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", Q_NULLPTR)); + newRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", nullptr)); #ifndef QT_NO_TOOLTIP - deleteRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Row", Q_NULLPTR)); + deleteRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Row", nullptr)); #endif // QT_NO_TOOLTIP - deleteRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", Q_NULLPTR)); + deleteRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", nullptr)); #ifndef QT_NO_TOOLTIP - moveRowUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Up", Q_NULLPTR)); + moveRowUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Up", nullptr)); #endif // QT_NO_TOOLTIP - moveRowUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", Q_NULLPTR)); + moveRowUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", nullptr)); #ifndef QT_NO_TOOLTIP - moveRowDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Down", Q_NULLPTR)); + moveRowDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Down", nullptr)); #endif // QT_NO_TOOLTIP - moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", Q_NULLPTR)); - label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", Q_NULLPTR)); + moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", nullptr)); + label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h index f3ec6d6fc9..131a352714 100644 --- a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h +++ b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h @@ -150,15 +150,15 @@ public: void retranslateUi(QWidget *TetrixWindow) { - TetrixWindow->setWindowTitle(QApplication::translate("TetrixWindow", "Tetrix", Q_NULLPTR)); - startButton->setText(QApplication::translate("TetrixWindow", "&Start", Q_NULLPTR)); - linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", Q_NULLPTR)); - pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", Q_NULLPTR)); - levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", Q_NULLPTR)); - nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", Q_NULLPTR)); - scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", Q_NULLPTR)); + TetrixWindow->setWindowTitle(QApplication::translate("TetrixWindow", "Tetrix", nullptr)); + startButton->setText(QApplication::translate("TetrixWindow", "&Start", nullptr)); + linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", nullptr)); + pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", nullptr)); + levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", nullptr)); + nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", nullptr)); + scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", nullptr)); nextPieceLabel->setText(QString()); - quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", Q_NULLPTR)); + quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/textfinder.ui.h b/tests/auto/tools/uic/baseline/textfinder.ui.h index 159cb54c0a..7443eacc48 100644 --- a/tests/auto/tools/uic/baseline/textfinder.ui.h +++ b/tests/auto/tools/uic/baseline/textfinder.ui.h @@ -96,9 +96,9 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Find Text", Q_NULLPTR)); - searchLabel->setText(QApplication::translate("Form", "&Keyword:", Q_NULLPTR)); - findButton->setText(QApplication::translate("Form", "&Find", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Find Text", nullptr)); + searchLabel->setText(QApplication::translate("Form", "&Keyword:", nullptr)); + findButton->setText(QApplication::translate("Form", "&Find", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h index 5580b437da..9a30232ff7 100644 --- a/tests/auto/tools/uic/baseline/topicchooser.ui.h +++ b/tests/auto/tools/uic/baseline/topicchooser.ui.h @@ -103,10 +103,10 @@ public: void retranslateUi(QDialog *TopicChooser) { - TopicChooser->setWindowTitle(QApplication::translate("TopicChooser", "Choose Topic", Q_NULLPTR)); - label->setText(QApplication::translate("TopicChooser", "&Topics", Q_NULLPTR)); - buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", Q_NULLPTR)); - buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", Q_NULLPTR)); + TopicChooser->setWindowTitle(QApplication::translate("TopicChooser", "Choose Topic", nullptr)); + label->setText(QApplication::translate("TopicChooser", "&Topics", nullptr)); + buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", nullptr)); + buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h index 14b1622d8f..0dcd249d68 100644 --- a/tests/auto/tools/uic/baseline/translatedialog.ui.h +++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h @@ -208,34 +208,34 @@ public: void retranslateUi(QDialog *TranslateDialog) { - TranslateDialog->setWindowTitle(QApplication::translate("TranslateDialog", "Qt Linguist", Q_NULLPTR)); + TranslateDialog->setWindowTitle(QApplication::translate("TranslateDialog", "Qt Linguist", nullptr)); #ifndef QT_NO_WHATSTHIS - TranslateDialog->setWhatsThis(QApplication::translate("TranslateDialog", "This window allows you to search for some text in the translation source file.", Q_NULLPTR)); + TranslateDialog->setWhatsThis(QApplication::translate("TranslateDialog", "This window allows you to search for some text in the translation source file.", nullptr)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - ledTranslateTo->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", Q_NULLPTR)); + ledTranslateTo->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", nullptr)); #endif // QT_NO_WHATSTHIS - findWhat->setText(QApplication::translate("TranslateDialog", "Find &source text:", Q_NULLPTR)); - translateTo->setText(QApplication::translate("TranslateDialog", "&Translate to:", Q_NULLPTR)); + findWhat->setText(QApplication::translate("TranslateDialog", "Find &source text:", nullptr)); + translateTo->setText(QApplication::translate("TranslateDialog", "&Translate to:", nullptr)); #ifndef QT_NO_WHATSTHIS - ledFindWhat->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", Q_NULLPTR)); + ledFindWhat->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", nullptr)); #endif // QT_NO_WHATSTHIS - groupBox->setTitle(QApplication::translate("TranslateDialog", "Search options", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("TranslateDialog", "Search options", nullptr)); #ifndef QT_NO_WHATSTHIS - ckMatchCase->setWhatsThis(QApplication::translate("TranslateDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", Q_NULLPTR)); + ckMatchCase->setWhatsThis(QApplication::translate("TranslateDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", nullptr)); #endif // QT_NO_WHATSTHIS - ckMatchCase->setText(QApplication::translate("TranslateDialog", "Match &case", Q_NULLPTR)); - ckMarkFinished->setText(QApplication::translate("TranslateDialog", "Mark new translation as &finished", Q_NULLPTR)); + ckMatchCase->setText(QApplication::translate("TranslateDialog", "Match &case", nullptr)); + ckMarkFinished->setText(QApplication::translate("TranslateDialog", "Mark new translation as &finished", nullptr)); #ifndef QT_NO_WHATSTHIS - findNxt->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to find the next occurrence of the text you typed in.", Q_NULLPTR)); + findNxt->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to find the next occurrence of the text you typed in.", nullptr)); #endif // QT_NO_WHATSTHIS - findNxt->setText(QApplication::translate("TranslateDialog", "Find Next", Q_NULLPTR)); - translate->setText(QApplication::translate("TranslateDialog", "Translate", Q_NULLPTR)); - translateAll->setText(QApplication::translate("TranslateDialog", "Translate All", Q_NULLPTR)); + findNxt->setText(QApplication::translate("TranslateDialog", "Find Next", nullptr)); + translate->setText(QApplication::translate("TranslateDialog", "Translate", nullptr)); + translateAll->setText(QApplication::translate("TranslateDialog", "Translate All", nullptr)); #ifndef QT_NO_WHATSTHIS - cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", Q_NULLPTR)); + cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", nullptr)); #endif // QT_NO_WHATSTHIS - cancel->setText(QApplication::translate("TranslateDialog", "Cancel", Q_NULLPTR)); + cancel->setText(QApplication::translate("TranslateDialog", "Cancel", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h b/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h index 08c063cf6f..9251582ef8 100644 --- a/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h +++ b/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h @@ -36,7 +36,7 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(i18n("Dialog", Q_NULLPTR)); + Dialog->setWindowTitle(i18n("Dialog", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h index 628c42d42e..ef4e3ab819 100644 --- a/tests/auto/tools/uic/baseline/translationsettings.ui.h +++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h @@ -102,10 +102,10 @@ public: void retranslateUi(QDialog *TranslationSettings) { - TranslationSettings->setWindowTitle(QApplication::translate("TranslationSettings", "Qt Linguist - Translation file settings", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", Q_NULLPTR)); - label->setText(QApplication::translate("TranslationSettings", "Language", Q_NULLPTR)); - lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", Q_NULLPTR)); + TranslationSettings->setWindowTitle(QApplication::translate("TranslationSettings", "Qt Linguist - Translation file settings", nullptr)); + groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", nullptr)); + label->setText(QApplication::translate("TranslationSettings", "Language", nullptr)); + lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h index ce077c42f4..6257bb8245 100644 --- a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h @@ -278,63 +278,63 @@ public: void retranslateUi(QDialog *qdesigner_internal__TreeWidgetEditor) { - qdesigner_internal__TreeWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Edit Tree Widget", Q_NULLPTR)); - itemsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", Q_NULLPTR)); + qdesigner_internal__TreeWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Edit Tree Widget", nullptr)); + itemsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", nullptr)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("qdesigner_internal::TreeWidgetEditor", "1", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("qdesigner_internal::TreeWidgetEditor", "1", nullptr)); #ifndef QT_NO_TOOLTIP - treeWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", Q_NULLPTR)); + treeWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Item", Q_NULLPTR)); + newItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Item", nullptr)); #endif // QT_NO_TOOLTIP - newItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&New", Q_NULLPTR)); + newItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&New", nullptr)); #ifndef QT_NO_TOOLTIP - newSubItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Subitem", Q_NULLPTR)); + newSubItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Subitem", nullptr)); #endif // QT_NO_TOOLTIP - newSubItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New &Subitem", Q_NULLPTR)); + newSubItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New &Subitem", nullptr)); #ifndef QT_NO_TOOLTIP - deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Item", Q_NULLPTR)); + deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Item", nullptr)); #endif // QT_NO_TOOLTIP - deleteItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&Delete", Q_NULLPTR)); + deleteItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&Delete", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemLeftButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Left (before Parent Item)", Q_NULLPTR)); + moveItemLeftButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Left (before Parent Item)", nullptr)); #endif // QT_NO_TOOLTIP - moveItemLeftButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "L", Q_NULLPTR)); + moveItemLeftButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "L", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemRightButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Right (as a First Subitem of the Next Sibling Item)", Q_NULLPTR)); + moveItemRightButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Right (as a First Subitem of the Next Sibling Item)", nullptr)); #endif // QT_NO_TOOLTIP - moveItemRightButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "R", Q_NULLPTR)); + moveItemRightButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "R", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Up", Q_NULLPTR)); + moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Up", nullptr)); #endif // QT_NO_TOOLTIP - moveItemUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", Q_NULLPTR)); + moveItemUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", nullptr)); #ifndef QT_NO_TOOLTIP - moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Down", Q_NULLPTR)); + moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Down", nullptr)); #endif // QT_NO_TOOLTIP - moveItemDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", Q_NULLPTR)); - label_2->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", Q_NULLPTR)); - columnsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Columns", Q_NULLPTR)); + moveItemDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", nullptr)); + label_2->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", nullptr)); + columnsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Columns", nullptr)); #ifndef QT_NO_TOOLTIP - listWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Columns", Q_NULLPTR)); + listWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Columns", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Column", Q_NULLPTR)); + newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Column", nullptr)); #endif // QT_NO_TOOLTIP - newColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New", Q_NULLPTR)); + newColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New", nullptr)); #ifndef QT_NO_TOOLTIP - deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Column", Q_NULLPTR)); + deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Column", nullptr)); #endif // QT_NO_TOOLTIP - deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete", Q_NULLPTR)); + deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete", nullptr)); #ifndef QT_NO_TOOLTIP - moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Up", Q_NULLPTR)); + moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Up", nullptr)); #endif // QT_NO_TOOLTIP - moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", Q_NULLPTR)); + moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", nullptr)); #ifndef QT_NO_TOOLTIP - moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Down", Q_NULLPTR)); + moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Down", nullptr)); #endif // QT_NO_TOOLTIP - moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", Q_NULLPTR)); - label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", Q_NULLPTR)); + moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", nullptr)); + label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h index 7545b4c803..d23e8bae4c 100644 --- a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h +++ b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h @@ -164,21 +164,21 @@ public: void retranslateUi(QMainWindow *TrPreviewToolClass) { - TrPreviewToolClass->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Qt Translation Preview Tool", Q_NULLPTR)); - actionOpenForm->setText(QApplication::translate("TrPreviewToolClass", "&Open Form...", Q_NULLPTR)); - actionLoadTranslation->setText(QApplication::translate("TrPreviewToolClass", "&Load Translation...", Q_NULLPTR)); - actionReloadTranslations->setText(QApplication::translate("TrPreviewToolClass", "&Reload Translations", Q_NULLPTR)); + TrPreviewToolClass->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Qt Translation Preview Tool", nullptr)); + actionOpenForm->setText(QApplication::translate("TrPreviewToolClass", "&Open Form...", nullptr)); + actionLoadTranslation->setText(QApplication::translate("TrPreviewToolClass", "&Load Translation...", nullptr)); + actionReloadTranslations->setText(QApplication::translate("TrPreviewToolClass", "&Reload Translations", nullptr)); #ifndef QT_NO_SHORTCUT - actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", Q_NULLPTR)); + actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", nullptr)); #endif // QT_NO_SHORTCUT - actionClose->setText(QApplication::translate("TrPreviewToolClass", "&Close", Q_NULLPTR)); - actionAbout->setText(QApplication::translate("TrPreviewToolClass", "About", Q_NULLPTR)); - actionAbout_Qt->setText(QApplication::translate("TrPreviewToolClass", "About Qt", Q_NULLPTR)); - menuView->setTitle(QApplication::translate("TrPreviewToolClass", "&View", Q_NULLPTR)); - menuViewViews->setTitle(QApplication::translate("TrPreviewToolClass", "&Views", Q_NULLPTR)); - menuHelp->setTitle(QApplication::translate("TrPreviewToolClass", "&Help", Q_NULLPTR)); - menuFile->setTitle(QApplication::translate("TrPreviewToolClass", "&File", Q_NULLPTR)); - dwForms->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Forms", Q_NULLPTR)); + actionClose->setText(QApplication::translate("TrPreviewToolClass", "&Close", nullptr)); + actionAbout->setText(QApplication::translate("TrPreviewToolClass", "About", nullptr)); + actionAbout_Qt->setText(QApplication::translate("TrPreviewToolClass", "About Qt", nullptr)); + menuView->setTitle(QApplication::translate("TrPreviewToolClass", "&View", nullptr)); + menuViewViews->setTitle(QApplication::translate("TrPreviewToolClass", "&Views", nullptr)); + menuHelp->setTitle(QApplication::translate("TrPreviewToolClass", "&Help", nullptr)); + menuFile->setTitle(QApplication::translate("TrPreviewToolClass", "&File", nullptr)); + dwForms->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Forms", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h index fab7e41e0e..546c050dd8 100644 --- a/tests/auto/tools/uic/baseline/validators.ui.h +++ b/tests/auto/tools/uic/baseline/validators.ui.h @@ -378,22 +378,22 @@ public: void retranslateUi(QWidget *ValidatorsForm) { - ValidatorsForm->setWindowTitle(QApplication::translate("ValidatorsForm", "Form", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("ValidatorsForm", "QIntValidator", Q_NULLPTR)); - label->setText(QApplication::translate("ValidatorsForm", "Min:", Q_NULLPTR)); - label_2->setText(QApplication::translate("ValidatorsForm", "Max:", Q_NULLPTR)); - label_7->setText(QApplication::translate("ValidatorsForm", "editingFinished()", Q_NULLPTR)); - groupBox_2->setTitle(QApplication::translate("ValidatorsForm", "QDoubleValidator", Q_NULLPTR)); - label_3->setText(QApplication::translate("ValidatorsForm", "Min:", Q_NULLPTR)); - label_5->setText(QApplication::translate("ValidatorsForm", "Format:", Q_NULLPTR)); - doubleFormat->setItemText(0, QApplication::translate("ValidatorsForm", "Standard", Q_NULLPTR)); - doubleFormat->setItemText(1, QApplication::translate("ValidatorsForm", "Scientific", Q_NULLPTR)); - - label_4->setText(QApplication::translate("ValidatorsForm", "Max:", Q_NULLPTR)); - label_6->setText(QApplication::translate("ValidatorsForm", "Decimals:", Q_NULLPTR)); + ValidatorsForm->setWindowTitle(QApplication::translate("ValidatorsForm", "Form", nullptr)); + groupBox->setTitle(QApplication::translate("ValidatorsForm", "QIntValidator", nullptr)); + label->setText(QApplication::translate("ValidatorsForm", "Min:", nullptr)); + label_2->setText(QApplication::translate("ValidatorsForm", "Max:", nullptr)); + label_7->setText(QApplication::translate("ValidatorsForm", "editingFinished()", nullptr)); + groupBox_2->setTitle(QApplication::translate("ValidatorsForm", "QDoubleValidator", nullptr)); + label_3->setText(QApplication::translate("ValidatorsForm", "Min:", nullptr)); + label_5->setText(QApplication::translate("ValidatorsForm", "Format:", nullptr)); + doubleFormat->setItemText(0, QApplication::translate("ValidatorsForm", "Standard", nullptr)); + doubleFormat->setItemText(1, QApplication::translate("ValidatorsForm", "Scientific", nullptr)); + + label_4->setText(QApplication::translate("ValidatorsForm", "Max:", nullptr)); + label_6->setText(QApplication::translate("ValidatorsForm", "Decimals:", nullptr)); doubleLedWidget->setText(QString()); - label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", Q_NULLPTR)); - pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", Q_NULLPTR)); + label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", nullptr)); + pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", nullptr)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h index c84a6e2631..48820b14a0 100644 --- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h @@ -253,34 +253,34 @@ public: void retranslateUi(QDialog *WateringConfigDialog) { - WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", Q_NULLPTR)); - label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", Q_NULLPTR)); - plantComboBox->setItemText(0, QApplication::translate("WateringConfigDialog", "Squash", Q_NULLPTR)); - plantComboBox->setItemText(1, QApplication::translate("WateringConfigDialog", "Bean", Q_NULLPTR)); - plantComboBox->setItemText(2, QApplication::translate("WateringConfigDialog", "Carrot", Q_NULLPTR)); - plantComboBox->setItemText(3, QApplication::translate("WateringConfigDialog", "Strawberry", Q_NULLPTR)); - plantComboBox->setItemText(4, QApplication::translate("WateringConfigDialog", "Raspberry", Q_NULLPTR)); - plantComboBox->setItemText(5, QApplication::translate("WateringConfigDialog", "Blueberry", Q_NULLPTR)); - - label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", Q_NULLPTR)); - temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", Q_NULLPTR)); + WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", nullptr)); + label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", nullptr)); + plantComboBox->setItemText(0, QApplication::translate("WateringConfigDialog", "Squash", nullptr)); + plantComboBox->setItemText(1, QApplication::translate("WateringConfigDialog", "Bean", nullptr)); + plantComboBox->setItemText(2, QApplication::translate("WateringConfigDialog", "Carrot", nullptr)); + plantComboBox->setItemText(3, QApplication::translate("WateringConfigDialog", "Strawberry", nullptr)); + plantComboBox->setItemText(4, QApplication::translate("WateringConfigDialog", "Raspberry", nullptr)); + plantComboBox->setItemText(5, QApplication::translate("WateringConfigDialog", "Blueberry", nullptr)); + + label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", nullptr)); + temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", nullptr)); temperatureSpinBox->setSpecialValueText(QString()); - temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", Q_NULLPTR)); - rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", Q_NULLPTR)); + temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", nullptr)); + rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", nullptr)); rainSpinBox->setSpecialValueText(QString()); - rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", Q_NULLPTR)); - label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", Q_NULLPTR)); - label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", Q_NULLPTR)); - amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", Q_NULLPTR)); - label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", Q_NULLPTR)); - sourceComboBox->setItemText(0, QApplication::translate("WateringConfigDialog", "Foundain", Q_NULLPTR)); - sourceComboBox->setItemText(1, QApplication::translate("WateringConfigDialog", "River", Q_NULLPTR)); - sourceComboBox->setItemText(2, QApplication::translate("WateringConfigDialog", "Lake", Q_NULLPTR)); - sourceComboBox->setItemText(3, QApplication::translate("WateringConfigDialog", "Public Water System", Q_NULLPTR)); - - label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", Q_NULLPTR)); + rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", nullptr)); + label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", nullptr)); + label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", nullptr)); + amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", nullptr)); + label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", nullptr)); + sourceComboBox->setItemText(0, QApplication::translate("WateringConfigDialog", "Foundain", nullptr)); + sourceComboBox->setItemText(1, QApplication::translate("WateringConfigDialog", "River", nullptr)); + sourceComboBox->setItemText(2, QApplication::translate("WateringConfigDialog", "Lake", nullptr)); + sourceComboBox->setItemText(3, QApplication::translate("WateringConfigDialog", "Public Water System", nullptr)); + + label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", nullptr)); filterCheckBox->setText(QString()); - helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", Q_NULLPTR)); + helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", nullptr)); } // retranslateUi }; diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 5e3cb66aae..1be17b552e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -41,7 +41,6 @@ #include <qcommonstyle.h> #include <qstylefactory.h> #include <qscreen.h> -#include <QSysInfo> typedef QList<QGraphicsItem *> QGraphicsItemList; @@ -1777,16 +1776,10 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie() #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-23699", Continue); #endif -#ifdef Q_OS_WIN - if (QSysInfo::kernelVersion() == "10.0.15063") { - QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue); - } -#endif QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view)); QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w)); } - void tst_QGraphicsWidget::sizeHint_data() { QTest::addColumn<bool>("layout"); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index d328163a05..096beedf63 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -1774,12 +1774,6 @@ void tst_QWidget::activation() QCOMPARE(QApplication::activeWindow(), &widget2); widget2.hide(); QTest::qWait(waitTime); -#ifdef Q_OS_WIN - if (QSysInfo::kernelVersion() == "10.0.15063") { - QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue); - // This happens in automated Windows 10 Creators Update (10.0.15063) CI builds! - } -#endif QCOMPARE(QApplication::activeWindow(), &widget1); } #endif // Q_OS_WIN diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index a6855a417e..9dc513c115 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -104,6 +104,8 @@ private slots: void setWindowState(); void nativeShow(); + + void QTBUG_56277_resize_on_showEvent(); }; void tst_QWidget_window::initTestCase() @@ -931,5 +933,34 @@ void tst_QWidget_window::nativeShow() QTRY_VERIFY(!w.isVisible()); } +class ResizedOnShowEventWidget : public QWidget +{ +public: + void showEvent(QShowEvent *) override + { + const auto *primaryScreen = QApplication::primaryScreen(); + auto newSize = primaryScreen->availableGeometry().size() / 4; + if (newSize == geometry().size()) + newSize -= QSize(10, 10); + resize(newSize); + } +}; + +void tst_QWidget_window::QTBUG_56277_resize_on_showEvent() +{ + const auto platformName = QGuiApplication::platformName().toLower(); + if (platformName != "cocoa" && platformName != "windows") + QSKIP("This can only be consistently tested on desktop platforms with well-known behavior."); + + ResizedOnShowEventWidget w; + w.show(); + QVERIFY(QTest::qWaitForWindowExposed(&w)); + const auto *screen = w.windowHandle()->screen(); + const auto geometry = w.geometry(); + const int frameHeight = geometry.top() - w.frameGeometry().top(); + const int topmostY = screen->availableGeometry().top() + frameHeight; + QVERIFY(geometry.top() > topmostY || geometry.left() > screen->availableGeometry().left()); +} + QTEST_MAIN(tst_QWidget_window) #include "tst_qwidget_window.moc" diff --git a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro index 18425f4a25..0b710ab89c 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro +++ b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro @@ -3,4 +3,3 @@ TARGET = tst_bench_qsqlquery SOURCES += main.cpp QT = core sql testlib core-private sql-private -LIBS += $$QMAKE_LIBS_NETWORK diff --git a/tests/manual/qtabbar/main.cpp b/tests/manual/qtabbar/main.cpp index 466a7e20fc..82bcd838e6 100644 --- a/tests/manual/qtabbar/main.cpp +++ b/tests/manual/qtabbar/main.cpp @@ -103,6 +103,9 @@ int main(int argc, char *argv[]) // right // tabBar.setShape(QTabBar::RoundedEast); + const auto shortLabel = QStringLiteral("Tab %1"); + const auto longLabel = QStringLiteral("An Extremely Long Tab Label %1"); + QMap<int, QWidget*> tabs; for (int i = 0; i < TabCount; i++) { QString tabNumberString = QString::number(i); @@ -110,7 +113,7 @@ int main(int argc, char *argv[]) tabs[i] = label; label->setAlignment(Qt::AlignCenter); stackedWidget.addWidget(label); - tabBar.addTab(QStringLiteral("Tab %1").arg(tabNumberString)); + tabBar.addTab(shortLabel.arg(tabNumberString)); } QObject::connect(&tabBar, &QTabBar::tabMoved, [&tabs](int from, int to) { @@ -205,6 +208,13 @@ int main(int argc, char *argv[]) tabBar.setTabIcon(i, icon); }); + form.ui->longLabelButton->setChecked(false); + QObject::connect(form.ui->longLabelButton, &QCheckBox::toggled, [&] { + const auto &label = form.ui->longLabelButton->isChecked() ? longLabel : shortLabel; + for (int i = 0; i < tabBar.count(); i++) + tabBar.setTabText(i, label.arg(i)); + }); + QObject::connect(form.ui->shapeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [&](int index) { Q_UNUSED(index); // TODO diff --git a/tests/manual/qtabbar/tabbarform.ui b/tests/manual/qtabbar/tabbarform.ui index 17100b3b62..f8766f22f2 100644 --- a/tests/manual/qtabbar/tabbarform.ui +++ b/tests/manual/qtabbar/tabbarform.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>308</width> - <height>260</height> + <height>308</height> </rect> </property> <property name="sizePolicy"> @@ -22,24 +22,61 @@ <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> <layout class="QGridLayout" name="gridLayout"> - <item row="10" column="1"> - <widget class="QRadioButton" name="rightAlignedButton"> + <item row="7" column="1"> + <widget class="QComboBox" name="shapeComboBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <item> + <property name="text"> + <string>North</string> + </property> + </item> + <item> + <property name="text"> + <string>South</string> + </property> + </item> + <item> + <property name="text"> + <string>West</string> + </property> + </item> + <item> + <property name="text"> + <string>East</string> + </property> + </item> + </widget> + </item> + <item row="8" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>12</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> <property name="text"> - <string>Right aligned</string> + <string>Tab bar options:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <attribute name="buttonGroup"> - <string notr="true">textAlignmentGroup</string> - </attribute> </widget> </item> - <item row="8" column="1"> - <widget class="QRadioButton" name="leftAlignedButton"> + <item row="0" column="1"> + <widget class="QCheckBox" name="documentModeButton"> <property name="text"> - <string>Left aligned</string> + <string>Document mode</string> </property> - <attribute name="buttonGroup"> - <string notr="true">textAlignmentGroup</string> - </attribute> </widget> </item> <item row="2" column="1"> @@ -49,14 +86,14 @@ </property> </widget> </item> - <item row="8" column="0"> - <widget class="QLabel" name="label"> + <item row="9" column="1"> + <widget class="QRadioButton" name="leftAlignedButton"> <property name="text"> - <string>Tabs alignment:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <string>Left aligned</string> </property> + <attribute name="buttonGroup"> + <string notr="true">textAlignmentGroup</string> + </attribute> </widget> </item> <item row="1" column="1"> @@ -66,10 +103,13 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="documentModeButton"> + <item row="7" column="0"> + <widget class="QLabel" name="label_3"> <property name="text"> - <string>Document mode</string> + <string>Tab shape (TODO):</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> @@ -80,47 +120,17 @@ </property> </widget> </item> - <item row="6" column="1"> - <widget class="QComboBox" name="shapeComboBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <item> - <property name="text"> - <string>North</string> - </property> - </item> - <item> - <property name="text"> - <string>South</string> - </property> - </item> - <item> - <property name="text"> - <string>West</string> - </property> - </item> - <item> - <property name="text"> - <string>East</string> - </property> - </item> - </widget> - </item> - <item row="7" column="0"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <item row="9" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Tabs alignment:</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>12</height> - </size> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - </spacer> + </widget> </item> - <item row="5" column="1"> + <item row="6" column="1"> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -133,17 +143,14 @@ </property> </spacer> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> + <item row="4" column="1"> + <widget class="QCheckBox" name="displayIconButton"> <property name="text"> - <string>Tab bar options:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <string>Display icon</string> </property> </widget> </item> - <item row="9" column="1"> + <item row="10" column="1"> <widget class="QRadioButton" name="centeredButton"> <property name="text"> <string>Centered</string> @@ -153,20 +160,20 @@ </attribute> </widget> </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_3"> + <item row="11" column="1"> + <widget class="QRadioButton" name="rightAlignedButton"> <property name="text"> - <string>Tab shape (TODO):</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <string>Right aligned</string> </property> + <attribute name="buttonGroup"> + <string notr="true">textAlignmentGroup</string> + </attribute> </widget> </item> - <item row="4" column="1"> - <widget class="QCheckBox" name="displayIconButton"> + <item row="5" column="1"> + <widget class="QCheckBox" name="longLabelButton"> <property name="text"> - <string>Display icon</string> + <string>Long tab label</string> </property> </widget> </item> |