From dcfb814498be938421b56020d7c9946cce7296dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 25 Aug 2016 15:07:33 +0200 Subject: Cocoa: Add support for triple-buffered GL contexts As usual, the requested format may not be available, so clients should check the actual format to confirm triple-buffering. Change-Id: Icf073cc9ddf2c912eb5c3ce0ac80d1694d1c56d7 Reviewed-by: Jake Petroules Reviewed-by: Laszlo Agocs --- src/platformsupport/cglconvenience/cglconvenience.mm | 5 ++++- src/plugins/platforms/cocoa/qcocoaglcontext.mm | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 6b0a91e13f..fb609ae485 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -81,8 +81,11 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format) QVector attrs; - if (format.swapBehavior() != QSurfaceFormat::SingleBuffer) + if (format.swapBehavior() == QSurfaceFormat::DoubleBuffer + || format.swapBehavior() == QSurfaceFormat::DefaultSwapBehavior) attrs.append(NSOpenGLPFADoubleBuffer); + else if (format.swapBehavior() == QSurfaceFormat::TripleBuffer) + attrs.append(NSOpenGLPFATripleBuffer); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) { diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 0f9b8b900d..b77ca07141 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -305,8 +305,16 @@ void QCocoaGLContext::updateSurfaceFormat() m_format.setSamples(samples); int doubleBuffered = -1; + int tripleBuffered = -1; [pixelFormat getValues:&doubleBuffered forAttribute:NSOpenGLPFADoubleBuffer forVirtualScreen:0]; - m_format.setSwapBehavior(doubleBuffered == 1 ? QSurfaceFormat::DoubleBuffer : QSurfaceFormat::SingleBuffer); + [pixelFormat getValues:&tripleBuffered forAttribute:NSOpenGLPFATripleBuffer forVirtualScreen:0]; + + if (tripleBuffered == 1) + m_format.setSwapBehavior(QSurfaceFormat::TripleBuffer); + else if (doubleBuffered == 1) + m_format.setSwapBehavior(QSurfaceFormat::DoubleBuffer); + else + m_format.setSwapBehavior(QSurfaceFormat::SingleBuffer); int steroBuffers = -1; [pixelFormat getValues:&steroBuffers forAttribute:NSOpenGLPFAStereo forVirtualScreen:0]; -- cgit v1.2.3 From 55ab276700b9631f230d15d2c2edc16371191c45 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 25 Jul 2016 15:55:47 +0200 Subject: Major re-write of generate_expected_output.py Restructured, separated the canonicalising of output lines out (into an object that prepares the necessary regexes and replacements) suppress more, changed the path-stripping to strip qtbase's parent rather than os.getcwd() and took account of shadow builds (so both source tree and build tree provide prefixes we want to strip from paths). Also cope with $PWD potentially having symlinks in it, where os.getcwd() is canonical. It's possible some output might name files elsewhere in the source tree; these won't be filtered by the prior cwd prefix removal; and, in any case, the problem with cwd is only that the ancestry of qtbase is apt to vary; paths relative to there should be consistent between test runs. This change shall lead to a one-off rewrite of all expected_* files; but it should now catch all paths. By stripping both build root and source root (when different) it also avoids differences for those doing out-of-source ("shadow") builds. In our XML formats, any hyphens in root paths (e.g. I had Qt-5.6 in my build root's path) got represented by a character entity, confounding the replacement; so also do replacement that catches this. We may discover other character entity subsitutions needed along with this. Now filtering line numbers and timing information, including benchmark results; these numbers all get replaced with 0 to avoid noisy diffs. Also purging dangling hspace, to placate sanity-bot. The module can now be imported - the code it runs is packaged as a main() function that a __name__ == '__main__' stanza runs - and all data is localised to where it's needed, rather than held in globals. Tidied up and organized the existing regexes. There are doc-strings; there is a short usage comment. Data is localised rather than global and modern pythonic idioms get used where apt. Regexes are compiled once instead of repeatedly. An object looks after the list of patterns to apply and its construction handles all anticipated problems. Failures are mediated by an exception. The output file now gets written once, instead of twice (once before editing, then over-write to edit), and Popen uses text mode, so that write can do the same. Its command is delivered as an array, avoiding the need to invoke a shell. Instead of relying on qmake being in our path (which might give us a bogus QT_VERSION if the one in path doesn't match our build tree), use the relative path to qmake - we rely on being run in a specific directory in the build tree, after all. Escape dots in the version properly, so that 51730 doesn't get mistaken for 5.7.0 (for example), and moved this check later in the sequence (matching a smaller target makes it more likely to falsely match). Overtly check we are in the right directory and tell the user what we actually need, if run from the wrong place. Simplify handling of the unsupported use-case for MS-Windows (but note what would be needed for it). Change-Id: Ibdff8f8cae173f6c31492648148cc345ae29022b Reviewed-by: Mitch Curtis Reviewed-by: Frederik Gladhorn --- .../testlib/selftests/generate_expected_output.py | 260 ++++++++++++++------- 1 file changed, 178 insertions(+), 82 deletions(-) diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index b917dacc78..1bf8cf6603 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -32,89 +32,185 @@ ## ############################################################################# -#regenerate all test's output +# Regenerate all tests' output. +# +# Usage: cd to the build directory corresponding to this script's +# location; invoke this script; optionally pass the names of sub-dirs +# to limit which tests to regenerate expected_* files for. import os -import sys import subprocess -import re - -formats = ['xml', 'txt', 'xunitxml', 'lightxml'] - -qtver = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).strip().decode('utf-8') -rootPath = os.getcwd() - -isWindows = sys.platform == 'win32' - -replacements = [ - (qtver, r'@INSERT_QT_VERSION_HERE@'), - (r'Config: Using QtTest library.*', r'Config: Using QtTest library'), # Build string in text logs - (rootPath.encode('unicode-escape').decode('utf-8'), r''), - (r'( *)', r'\1'), - (r'( *)[^<]+', r'\1'), # Build element in xml, lightxml - (r'', r'') # Build in xunitxml -] - -extraArgs = { - "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", - "benchlibcallgrind": "-callgrind", - "benchlibeventcounter": "-eventcounter", - "benchliboptions": "-eventcounter", - "benchlibtickcounter": "-tickcounter", - "badxml": "-eventcounter", - "benchlibcounting": "-eventcounter", - "printdatatags": "-datatags", - "printdatatagswithglobaltags": "-datatags", - "silent": "-silent", - "verbose1": "-v1", - "verbose2": "-v2", -} - -# Replace all occurrences of searchExp in one file -def replaceInFile(file): - import sys - import fileinput - for line in fileinput.input(file, inplace=1): - for searchExp, replaceExp in replacements: - line = re.sub(searchExp, replaceExp, line) - sys.stdout.write(line) - -def subdirs(): - result = [] - for path in os.listdir('.'): - if os.path.isdir('./' + path): - result.append(path) - return result - -def getTestForPath(path): - if isWindows: - testpath = path + '\\' + path + '.exe' - else: - testpath = path + '/' + path - return testpath - -def generateTestData(testname): - print(" running " + testname) + +class Fail (Exception): pass + +class Cleaner (object): + """Tool to clean up test output to make diff-ing runs useful. + + We care about whether tests pass or fail - if that changes, + something that matters has happened - and we care about some + changes to what they say when they do fail; but we don't care + exactly what line of what file the failing line of code now + occupies, nor do we care how many milliseconds each test took to + run; and changes to the Qt version number mean nothing to us. + + Create one singleton instance; it'll do mildly expensive things + once and you can use its .clean() method to tidy up your test + output.""" + + def __init__(self, here, command): + """Set up the details we need for later cleaning. + + Takes two parameters: here is $PWD and command is how this + script was invoked, from which we'll work out where it is; in + a shadow build, the former is the build tree's location + corresponding to this last. Checks $PWD does look as expected + in a build tree - raising Fail() if not - then invokes qmake + to discover Qt version (saved as .version for the benefit of + clients) and prepares the sequence of (regex, replace) pairs + that .clean() needs to do its job.""" + self.version, self.__replace = self.__getPatterns(here, command) + + import re + @staticmethod + def __getPatterns(here, command, + patterns = ( + # Timings: + (r'( *', r'\1"0"/>'), # xml, lightxml + (r'(Totals:.*,) *[0-9.]+ms', r'\1 0ms'), # txt + # Benchmarks: + (r'[0-9,.]+( (?:CPU ticks|msecs) per iteration \(total:) [0-9,.]+ ', r'0\1 0, '), # txt + (r'(,"(?:CPUTicks|WalltimeMilliseconds)"),\d+,\d+,', r'\1,0,0,'), # csv + (r'([^<]+', r'\1/>'), # xml, lightxml + (r'()', r'\1\2'), # xunitxml + # Line numbers in source files: + (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt + # (r'(\[Loc: [^[\]()]+)\(\d+\)', r'\1(0)'), # teamcity + (r'( Date: Fri, 26 Aug 2016 11:57:21 +0200 Subject: QIcon::addFile(): Invoke QMimeDatabase when matching by suffix fails This will detect image files correctly even if case resource aliases without suffixed are used. Task-number: QTBUG-55388 Change-Id: I337ca1f6be7126fe731e5e278b23aaef6cdfd9ef Reviewed-by: Eirik Aavitsland --- src/gui/image/qicon.cpp | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 62ec8e93b2..716a7c52c2 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -47,6 +47,8 @@ #include "private/qiconloader_p.h" #include "qpainter.h" #include "qfileinfo.h" +#include +#include #include "qpixmapcache.h" #include "qvariant.h" #include "qcache.h" @@ -976,6 +978,18 @@ void QIcon::addPixmap(const QPixmap &pixmap, Mode mode, State state) d->engine->addPixmap(pixmap, mode, state); } +static QIconEngine *iconEngineFromSuffix(const QString &fileName, const QString &suffix) +{ + if (!suffix.isEmpty()) { + const int index = loader()->indexOf(suffix); + if (index != -1) { + if (QIconEnginePlugin *factory = qobject_cast(loader()->instance(index))) { + return factory->create(fileName); + } + } + } + return nullptr; +} /*! Adds an image from the file with the given \a fileName to the icon, as a specialization for \a size, \a mode and \a state. The @@ -1013,25 +1027,15 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State return; detach(); if (!d) { + QFileInfo info(fileName); - QString suffix = info.suffix(); - if (!suffix.isEmpty()) { - // first try version 2 engines.. - const int index = loader()->indexOf(suffix); - if (index != -1) { - if (QIconEnginePlugin *factory = qobject_cast(loader()->instance(index))) { - if (QIconEngine *engine = factory->create(fileName)) { - d = new QIconPrivate; - d->engine = engine; - } - } - } - } - // ...then fall back to the default engine - if (!d) { - d = new QIconPrivate; - d->engine = new QPixmapIconEngine; - } + QIconEngine *engine = iconEngineFromSuffix(fileName, info.suffix()); +#ifndef QT_NO_MIMETYPE + if (!engine) + engine = iconEngineFromSuffix(fileName, QMimeDatabase().mimeTypeForFile(info).preferredSuffix()); +#endif // !QT_NO_MIMETYPE + d = new QIconPrivate; + d->engine = engine ? engine : new QPixmapIconEngine; } d->engine->addFile(fileName, size, mode, state); -- cgit v1.2.3 From 17e5d9d7cadb4fceb39cfc875162add57e962db8 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 24 Jun 2016 10:57:10 +0200 Subject: Fix QMainWindow::restoreDockWidget() with GroupedDragging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to account for the fact that the placeholder might be in a floating tab. Task-number: QTBUG-50491 Change-Id: I03d8e49cc40f58691154f5c3984f3b0670a974d5 Reviewed-by: Friedemann Kleint Reviewed-by: Sérgio Martins --- src/widgets/widgets/qdockarealayout.cpp | 53 ++++++++++++++++------- src/widgets/widgets/qdockarealayout_p.h | 1 + src/widgets/widgets/qmainwindowlayout.cpp | 70 ++++++++++++++++++------------- src/widgets/widgets/qmainwindowlayout_p.h | 2 +- 4 files changed, 80 insertions(+), 46 deletions(-) diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index d22e89c6e1..1d10de904d 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -2604,6 +2604,21 @@ void QDockAreaLayout::remove(const QList &path) docks[index].remove(path.mid(1)); } +void QDockAreaLayout::removePlaceHolder(const QString &name) +{ + QList index = indexOfPlaceHolder(name); + if (!index.isEmpty()) + remove(index); + foreach (QDockWidgetGroupWindow *dwgw, mainWindow->findChildren( + QString(), Qt::FindDirectChildrenOnly)) { + index = dwgw->layoutInfo()->indexOfPlaceHolder(name); + if (!index.isEmpty()) { + dwgw->layoutInfo()->remove(index); + dwgw->destroyOrHideIfEmpty(); + } + } +} + static inline int qMax(int i1, int i2, int i3) { return qMax(i1, qMax(i2, i3)); } void QDockAreaLayout::getGrid(QVector *_ver_struct_list, @@ -3030,15 +3045,27 @@ QRect QDockAreaLayout::constrainedRect(QRect rect, QWidget* widget) bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget) { - QList index = indexOfPlaceHolder(dockWidget->objectName()); - if (index.isEmpty()) - return false; + QDockAreaLayoutItem *item = 0; + foreach (QDockWidgetGroupWindow *dwgw, mainWindow->findChildren( + QString(), Qt::FindDirectChildrenOnly)) { + QList index = dwgw->layoutInfo()->indexOfPlaceHolder(dockWidget->objectName()); + if (!index.isEmpty()) { + dockWidget->setParent(dwgw); + item = const_cast(&dwgw->layoutInfo()->item(index)); + break; + } + } + if (!item) { + QList index = indexOfPlaceHolder(dockWidget->objectName()); + if (index.isEmpty()) + return false; + item = const_cast(&this->item(index)); + } - QDockAreaLayoutItem &item = this->item(index); - QPlaceHolderItem *placeHolder = item.placeHolderItem; + QPlaceHolderItem *placeHolder = item->placeHolderItem; Q_ASSERT(placeHolder != 0); - item.widgetItem = new QDockWidgetItem(dockWidget); + item->widgetItem = new QDockWidgetItem(dockWidget); if (placeHolder->window) { const QRect r = constrainedRect(placeHolder->topLevelRect, dockWidget); @@ -3050,7 +3077,7 @@ bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget) dockWidget->d_func()->setWindowState(true); #endif - item.placeHolderItem = 0; + item->placeHolderItem = 0; delete placeHolder; return true; @@ -3086,9 +3113,7 @@ void QDockAreaLayout::addDockWidget(QInternal::DockPosition pos, QDockWidget *do info = new_info; } - QList index = indexOfPlaceHolder(dockWidget->objectName()); - if (!index.isEmpty()) - remove(index); + removePlaceHolder(dockWidget->objectName()); } void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second) @@ -3101,9 +3126,7 @@ void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second) Q_ASSERT(info != 0); info->tab(path.last(), new QDockWidgetItem(second)); - QList index = indexOfPlaceHolder(second->objectName()); - if (!index.isEmpty()) - remove(index); + removePlaceHolder(second->objectName()); } void QDockAreaLayout::resizeDocks(const QList &docks, @@ -3165,9 +3188,7 @@ void QDockAreaLayout::splitDockWidget(QDockWidget *after, Q_ASSERT(info != 0); info->split(path.last(), orientation, new QDockWidgetItem(dockWidget)); - QList index = indexOfPlaceHolder(dockWidget->objectName()); - if (!index.isEmpty()) - remove(index); + removePlaceHolder(dockWidget->objectName()); } void QDockAreaLayout::apply(bool animate) diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h index 5d352f0124..8a35d8b035 100644 --- a/src/widgets/widgets/qdockarealayout_p.h +++ b/src/widgets/widgets/qdockarealayout_p.h @@ -255,6 +255,7 @@ public: QLayoutItem *plug(const QList &path); QLayoutItem *unplug(const QList &path); void remove(const QList &path); + void removePlaceHolder(const QString &name); void fitLayout(); diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 6b247d8d11..f581fe4d88 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -215,11 +215,10 @@ public: } void setGeometry(const QRect&r) Q_DECL_OVERRIDE { + static_cast(parent())->destroyOrHideIfEmpty(); QDockAreaLayoutInfo *li = layoutInfo(); - if (li->isEmpty()) { - static_cast(parent())->destroyIfEmpty(); + if (li->isEmpty()) return; - } int fw = frameWidth(); li->reparentWidgets(parentWidget()); li->rect = r.adjusted(fw, fw, -fw, -fw); @@ -272,6 +271,10 @@ bool QDockWidgetGroupWindow::event(QEvent *e) if (qobject_cast(static_cast(e)->child())) adjustFlags(); break; + case QEvent::LayoutRequest: + // We might need to show the widget again + destroyOrHideIfEmpty(); + break; default: break; } @@ -325,34 +328,43 @@ QDockWidget *QDockWidgetGroupWindow::topDockWidget() const } /*! \internal - Destroy this window if there is no more QDockWidget in it. + Destroy or hide this window if there is no more QDockWidget in it. + Otherwise make sure it is shown. */ -void QDockWidgetGroupWindow::destroyIfEmpty() -{ - if (layoutInfo()->isEmpty()) { - // Make sure to reparent the possibly floating or hidden QDockWidgets to the parent - foreach (QDockWidget *dw, - findChildren(QString(), Qt::FindDirectChildrenOnly)) { - bool wasFloating = dw->isFloating(); - bool wasHidden = dw->isHidden(); - dw->setParent(parentWidget()); - if (wasFloating) { - dw->setFloating(true); - } else { - // maybe it was hidden, we still have to put it back in the main layout. - QMainWindowLayout *ml = qt_mainwindow_layout(static_cast(parentWidget())); - Qt::DockWidgetArea area = ml->dockWidgetArea(this); - if (area == Qt::NoDockWidgetArea) - area = Qt::LeftDockWidgetArea; - static_cast(parentWidget())->addDockWidget(area, dw); - } - if (!wasHidden) - dw->show(); +void QDockWidgetGroupWindow::destroyOrHideIfEmpty() +{ + if (!layoutInfo()->isEmpty()) { + show(); // It might have been hidden, + return; + } + // There might still be placeholders + if (!layoutInfo()->item_list.isEmpty()) { + hide(); + return; + } + + // Make sure to reparent the possibly floating or hidden QDockWidgets to the parent + foreach (QDockWidget *dw, findChildren(QString(), Qt::FindDirectChildrenOnly)) { + bool wasFloating = dw->isFloating(); + bool wasHidden = dw->isHidden(); + dw->setParent(parentWidget()); + if (wasFloating) { + dw->setFloating(true); + } else { + // maybe it was hidden, we still have to put it back in the main layout. + QMainWindowLayout *ml = + qt_mainwindow_layout(static_cast(parentWidget())); + Qt::DockWidgetArea area = ml->dockWidgetArea(this); + if (area == Qt::NoDockWidgetArea) + area = Qt::LeftDockWidgetArea; + static_cast(parentWidget())->addDockWidget(area, dw); } - foreach (QTabBar *tb, findChildren(QString(), Qt::FindDirectChildrenOnly)) - tb->setParent(parentWidget()); - deleteLater(); + if (!wasHidden) + dw->show(); } + foreach (QTabBar *tb, findChildren(QString(), Qt::FindDirectChildrenOnly)) + tb->setParent(parentWidget()); + deleteLater(); } /*! \internal @@ -2075,7 +2087,7 @@ void QMainWindowLayout::animationFinished(QWidget *widget) item.subinfo->reparentWidgets(parentWidget()); item.subinfo->setTabBarShape(parentInfo->tabBarShape); } - dwgw->destroyIfEmpty(); + dwgw->destroyOrHideIfEmpty(); } if (QDockWidget *dw = qobject_cast(widget)) { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 9a13e5f5ce..7475da8bdc 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -86,7 +86,7 @@ public: : QWidget(parent, f) {} QDockAreaLayoutInfo *layoutInfo() const; QDockWidget *topDockWidget() const; - void destroyIfEmpty(); + void destroyOrHideIfEmpty(); void adjustFlags(); protected: bool event(QEvent *) Q_DECL_OVERRIDE; -- cgit v1.2.3 From ce2815b43c3f10c474c35d30197e14c58c9106ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 19 Aug 2016 14:44:21 +0200 Subject: Guard against calling QWindow::requestUpdate() on non-GUI threads Change-Id: I851ff672bc234146deb61615fc7c56df87d62065 Reviewed-by: Laszlo Agocs Reviewed-by: Timur Pocheptsov --- src/gui/kernel/qwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 2e212e5fdb..bcd29b6fe1 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2160,6 +2160,9 @@ void QWindowPrivate::deliverUpdateRequest() */ void QWindow::requestUpdate() { + Q_ASSERT_X(QThread::currentThread() == QCoreApplication::instance()->thread(), + "QWindow", "Updates can only be scheduled from the GUI (main) thread"); + Q_D(QWindow); if (d->updateRequestPending || !d->platformWindow) return; -- cgit v1.2.3 From 579283507c392fc5bc0976c054304ecb8938cb06 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 30 Aug 2016 13:42:43 +0200 Subject: QWin32PrintEngine: Fix uninitialized memory read of dpi_x, dpi_y Discovered by purify: QWin32PrintEnginePrivate::initialize() called updateMetrics() via updatePageLayout() after initHDC(), so dpi_x, dpi_y were accessed before initialized from the display resolution. Fix by moving the call initHDC() up and giving default values. Change-Id: Ia360c06d156e569ca6b1472ec5b5cdc52948f913 Reviewed-by: Andy Shaw --- src/printsupport/kernel/qprintengine_win.cpp | 4 ++-- src/printsupport/kernel/qprintengine_win_p.h | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index a9d316095c..1c02d389fe 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -918,14 +918,14 @@ void QWin32PrintEnginePrivate::initialize() Q_ASSERT(hPrinter); Q_ASSERT(pInfo); + initHDC(); + if (devMode) { num_copies = devMode->dmCopies; devMode->dmCollate = DMCOLLATE_TRUE; updatePageLayout(); } - initHDC(); - #if defined QT_DEBUG_DRAW || defined QT_DEBUG_METRICS qDebug() << "QWin32PrintEngine::initialize()"; debugMetrics(); diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index c1d7b452f9..74b78ae2b1 100644 --- a/src/printsupport/kernel/qprintengine_win_p.h +++ b/src/printsupport/kernel/qprintengine_win_p.h @@ -124,10 +124,14 @@ public: state(QPrinter::Idle), resolution(0), m_pageLayout(QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0, 0, 0, 0))), + stretch_x(1), stretch_y(1), origin_x(0), origin_y(0), + dpi_x(96), dpi_y(96), dpi_display(96), num_copies(1), printToFile(false), reinit(false), - embed_fonts(true) + complex_xform(false), has_pen(false), has_brush(false), has_custom_paper_size(false), + embed_fonts(true), + txop(0 /* QTransform::TxNone */) { } -- cgit v1.2.3 From 2ca4fd401b90831857a0dcd643e5d382feb75cb0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 5 Aug 2016 14:43:15 +0200 Subject: QIcon: Set the pixmap's dpr to 1.0 if the window is also set to 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the pixmap is initially from a higher device pixel ratio and it is being used on a window that does not have a device pixel ratio other than 1.0 set then the pixmap should also have it set to 1.0. This ensures that the size of the pixmap is preserved and it is not scaled down as a result on the normal display. Change-Id: Ie5d96b3e1508867b723000bea182c8157640af02 Reviewed-by: Morten Johan Sørvig --- src/gui/image/qicon.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index e1e5367766..3531be412e 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -835,8 +835,11 @@ QPixmap QIcon::pixmap(QWindow *window, const QSize &size, Mode mode, State state qreal devicePixelRatio = qt_effective_device_pixel_ratio(window); // Handle the simple normal-dpi case: - if (!(devicePixelRatio > 1.0)) - return d->engine->pixmap(size, mode, state); + if (!(devicePixelRatio > 1.0)) { + QPixmap pixmap = d->engine->pixmap(size, mode, state); + pixmap.setDevicePixelRatio(1.0); + return pixmap; + } // Try get a pixmap that is big enough to be displayed at device pixel resolution. QPixmap pixmap = d->engine->pixmap(size * devicePixelRatio, mode, state); -- cgit v1.2.3 From 531a2b1b1c26127f75bfe1230051db615e5874c5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 30 Aug 2016 12:25:00 +0200 Subject: Windows QPA: Fix leaks in native file dialogs Release the IShellItem instances according to the documentation of IFile[Open]Dialog. Task-number: QTBUG-55509 Task-number: QTBUG-55459 Change-Id: Ib79622cde21982b1bda0be7d0483c6e652a1d5fe Reviewed-by: Andreas Holzammer Reviewed-by: Simon Hausmann Reviewed-by: Maurice Kalinowski --- src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 6e8df340df..94bb71e429 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -1044,12 +1044,15 @@ void QWindowsNativeFileDialogBase::setDirectory(const QUrl &directory) QString QWindowsNativeFileDialogBase::directory() const { + QString result; #ifndef Q_OS_WINCE IShellItem *item = 0; - if (m_fileDialog && SUCCEEDED(m_fileDialog->GetFolder(&item)) && item) - return QWindowsNativeFileDialogBase::itemPath(item); + if (m_fileDialog && SUCCEEDED(m_fileDialog->GetFolder(&item)) && item) { + result = QWindowsNativeFileDialogBase::itemPath(item); + item->Release(); + } #endif - return QString(); + return result; } void QWindowsNativeFileDialogBase::doExec(HWND owner) @@ -1514,8 +1517,10 @@ QList QWindowsNativeSaveFileDialog::selectedFiles() const QList result; IShellItem *item = 0; const HRESULT hr = fileDialog()->GetCurrentSelection(&item); - if (SUCCEEDED(hr) && item) + if (SUCCEEDED(hr) && item) { result.push_back(QUrl::fromLocalFile(QWindowsNativeSaveFileDialog::itemPath(item))); + item->Release(); + } return result; } -- cgit v1.2.3 From fa2aef5eb8f1a28a79e253a006f348e62afef58a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 30 Jun 2016 14:56:34 +0200 Subject: Fix QWindowPrivate::globalPosition() for foreign windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use mapToGlobal(QPoint(0, 0)) when encountering a foreign window in the parent hierarchy as it is not clear whether it is a native top level or child. In the latter case, using the position is not sufficient. Task-number: QTBUG-43252 Change-Id: I5eebb1f0dbc6a0abbd968c5d383d3eded75c11a5 Reviewed-by: Jan Arve Sæther --- src/gui/kernel/qwindow_p.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index ccd14f66ae..4020376feb 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -125,8 +125,14 @@ public: QPoint globalPosition() const { Q_Q(const QWindow); QPoint offset = q->position(); - for (const QWindow *p = q->parent(); p; p = p->parent()) - offset += p->position(); + for (const QWindow *p = q->parent(); p; p = p->parent()) { + if (p->type() != Qt::ForeignWindow) { + offset += p->position(); + } else { // QTBUG-43252, mapToGlobal() for foreign children. + offset += p->mapToGlobal(QPoint(0, 0)); + break; + } + } return offset; } -- cgit v1.2.3 From 013210e9dae24288f4e408b4a574433da435ab8a Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 30 Aug 2016 19:29:37 -0700 Subject: Fix unused variable warning on iOS Change-Id: Ieae5d7833b45a49a743a52a437d5383bd8a962c5 Reviewed-by: Thiago Macieira --- src/gui/opengl/qopenglframebufferobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 1ee90a0827..56e04c09d8 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -1281,11 +1281,11 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ ? context->hasExtension(QByteArrayLiteral("GL_EXT_read_format_bgra")) : context->hasExtension(QByteArrayLiteral("GL_EXT_bgra")); +#ifndef Q_OS_IOS const char *renderer = reinterpret_cast(funcs->glGetString(GL_RENDERER)); const char *ver = reinterpret_cast(funcs->glGetString(GL_VERSION)); // Blacklist GPU chipsets that have problems with their BGRA support. -#ifndef Q_OS_IOS const bool blackListed = (qstrcmp(renderer, "PowerVR Rogue G6200") == 0 && ::strstr(ver, "1.3") != 0) || (qstrcmp(renderer, "Mali-T760") == 0 -- cgit v1.2.3 From 4e53159d431e39c03488517588669ae2cc9052d1 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 30 Aug 2016 19:29:20 -0700 Subject: Mark Apple Clang 7.x as warning-free on macOS and (also Clang 3.9) iOS iOS was excluded in 09aeda21b902763919c2e0b2b06d09275d136e8c, probably unnecessarily. The build has been found to be warning-free. Change-Id: I81de2fff40938b6ab9f7a6a5b9f08f8a8baadb16 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_common.prf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index c1809468af..6512fb1db2 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -52,12 +52,12 @@ warnings_are_errors:warning_clean { # If the module declares that it has does its clean-up of warnings, enable -Werror. # This setting is compiler-dependent anyway because it depends on the version of the # compiler. - clang:!ios { - # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4 + clang { + # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4,7.0-7.3 # Regular clang 3.3-3.9 apple_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} reg_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]")|contains(reg_ver, "3\\.[3-9]") { + contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]|7\\.[0123]")|contains(reg_ver, "3\\.[3-9]") { QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR } } else:intel_icc:linux { -- cgit v1.2.3 From 816a6238761810c28a991a959ea61a834de2a2a5 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Tue, 16 Aug 2016 20:52:14 -0700 Subject: uic: generate translate calls with Q_NULLPTR instead of 0 uic should use Q_NULLPTR instead of 0 as the default disambiguation context. Task-number: QTBUG-45291 Change-Id: I889182c7fe1c4be3336f3cd645aa60838863c633 Reviewed-by: Marc Mutz --- src/tools/uic/cpp/cppwriteinitialization.cpp | 2 +- .../uic/baseline/Dialog_with_Buttons_Bottom.ui.h | 2 +- .../uic/baseline/Dialog_with_Buttons_Right.ui.h | 2 +- .../tools/uic/baseline/Dialog_without_Buttons.ui.h | 2 +- tests/auto/tools/uic/baseline/Main_Window.ui.h | 2 +- tests/auto/tools/uic/baseline/Widget.ui.h | 8 +- tests/auto/tools/uic/baseline/addlinkdialog.ui.h | 6 +- tests/auto/tools/uic/baseline/addtorrentform.ui.h | 34 +++---- .../tools/uic/baseline/authenticationdialog.ui.h | 12 +-- tests/auto/tools/uic/baseline/backside.ui.h | 38 +++---- .../auto/tools/uic/baseline/batchtranslation.ui.h | 20 ++-- tests/auto/tools/uic/baseline/bookmarkdialog.ui.h | 12 +-- tests/auto/tools/uic/baseline/bookwindow.ui.h | 16 +-- tests/auto/tools/uic/baseline/browserwidget.ui.h | 16 +-- .../tools/uic/baseline/bug18156QTreeWidget.ui.h | 4 +- tests/auto/tools/uic/baseline/calculator.ui.h | 56 +++++------ tests/auto/tools/uic/baseline/calculatorform.ui.h | 14 +-- tests/auto/tools/uic/baseline/certificateinfo.ui.h | 6 +- tests/auto/tools/uic/baseline/chatdialog.ui.h | 4 +- tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 24 ++--- tests/auto/tools/uic/baseline/chatsetnickname.ui.h | 8 +- tests/auto/tools/uic/baseline/config.ui.h | 74 +++++++------- tests/auto/tools/uic/baseline/connectdialog.ui.h | 12 +-- tests/auto/tools/uic/baseline/controller.ui.h | 12 +-- tests/auto/tools/uic/baseline/cookies.ui.h | 6 +- .../auto/tools/uic/baseline/cookiesexceptions.ui.h | 18 ++-- tests/auto/tools/uic/baseline/default.ui.h | 84 ++++++++-------- tests/auto/tools/uic/baseline/dialog.ui.h | 8 +- tests/auto/tools/uic/baseline/downloaditem.ui.h | 12 +-- tests/auto/tools/uic/baseline/downloads.ui.h | 6 +- tests/auto/tools/uic/baseline/embeddeddialog.ui.h | 14 +-- tests/auto/tools/uic/baseline/enumnostdset.ui.h | 2 +- tests/auto/tools/uic/baseline/filespage.ui.h | 8 +- .../auto/tools/uic/baseline/filternamedialog.ui.h | 4 +- tests/auto/tools/uic/baseline/filterpage.ui.h | 14 +-- tests/auto/tools/uic/baseline/finddialog.ui.h | 36 +++---- tests/auto/tools/uic/baseline/form.ui.h | 6 +- .../tools/uic/baseline/formwindowsettings.ui.h | 22 ++-- tests/auto/tools/uic/baseline/generalpage.ui.h | 6 +- tests/auto/tools/uic/baseline/gridalignment.ui.h | 10 +- tests/auto/tools/uic/baseline/gridpanel.ui.h | 16 +-- tests/auto/tools/uic/baseline/helpdialog.ui.h | 66 ++++++------ tests/auto/tools/uic/baseline/history.ui.h | 6 +- tests/auto/tools/uic/baseline/icontheme.ui.h | 8 +- tests/auto/tools/uic/baseline/identifierpage.ui.h | 8 +- tests/auto/tools/uic/baseline/imagedialog.ui.h | 16 +-- tests/auto/tools/uic/baseline/inputpage.ui.h | 6 +- tests/auto/tools/uic/baseline/installdialog.ui.h | 14 +-- tests/auto/tools/uic/baseline/languagesdialog.ui.h | 24 ++--- .../auto/tools/uic/baseline/listwidgeteditor.ui.h | 24 ++--- tests/auto/tools/uic/baseline/mainwindow.ui.h | 48 ++++----- tests/auto/tools/uic/baseline/mydialog.ui.h | 8 +- tests/auto/tools/uic/baseline/myform.ui.h | 22 ++-- tests/auto/tools/uic/baseline/newactiondialog.ui.h | 8 +- .../uic/baseline/newdynamicpropertydialog.ui.h | 6 +- tests/auto/tools/uic/baseline/newform.ui.h | 8 +- tests/auto/tools/uic/baseline/orderdialog.ui.h | 8 +- tests/auto/tools/uic/baseline/outputpage.ui.h | 6 +- tests/auto/tools/uic/baseline/pagefold.ui.h | 88 ++++++++-------- tests/auto/tools/uic/baseline/paletteeditor.ui.h | 18 ++-- tests/auto/tools/uic/baseline/passworddialog.ui.h | 10 +- tests/auto/tools/uic/baseline/pathpage.ui.h | 10 +- tests/auto/tools/uic/baseline/phrasebookbox.ui.h | 32 +++--- tests/auto/tools/uic/baseline/plugindialog.ui.h | 8 +- .../auto/tools/uic/baseline/preferencesdialog.ui.h | 10 +- .../uic/baseline/previewconfigurationwidget.ui.h | 16 +-- .../auto/tools/uic/baseline/previewdialogbase.ui.h | 8 +- tests/auto/tools/uic/baseline/previewwidget.ui.h | 22 ++-- tests/auto/tools/uic/baseline/proxy.ui.h | 10 +- tests/auto/tools/uic/baseline/qfiledialog.ui.h | 16 +-- .../auto/tools/uic/baseline/qpagesetupwidget.ui.h | 40 ++++---- .../tools/uic/baseline/qprintpropertieswidget.ui.h | 6 +- .../tools/uic/baseline/qprintsettingsoutput.ui.h | 38 +++---- tests/auto/tools/uic/baseline/qprintwidget.ui.h | 18 ++-- .../tools/uic/baseline/qsqlconnectiondialog.ui.h | 24 ++--- .../auto/tools/uic/baseline/qtgradientdialog.ui.h | 2 +- .../auto/tools/uic/baseline/qtgradienteditor.ui.h | 112 ++++++++++----------- tests/auto/tools/uic/baseline/qtgradientview.ui.h | 10 +- .../tools/uic/baseline/qtgradientviewdialog.ui.h | 2 +- .../tools/uic/baseline/qtresourceeditordialog.ui.h | 22 ++-- tests/auto/tools/uic/baseline/qttoolbardialog.ui.h | 38 +++---- tests/auto/tools/uic/baseline/querywidget.ui.h | 8 +- tests/auto/tools/uic/baseline/remotecontrol.ui.h | 26 ++--- .../tools/uic/baseline/saveformastemplate.ui.h | 6 +- tests/auto/tools/uic/baseline/settings.ui.h | 14 +-- .../auto/tools/uic/baseline/signalslotdialog.ui.h | 22 ++-- tests/auto/tools/uic/baseline/sslclient.ui.h | 22 ++-- tests/auto/tools/uic/baseline/sslerrors.ui.h | 10 +- tests/auto/tools/uic/baseline/statistics.ui.h | 26 ++--- .../auto/tools/uic/baseline/stringlisteditor.ui.h | 22 ++-- .../auto/tools/uic/baseline/stylesheeteditor.ui.h | 14 +-- tests/auto/tools/uic/baseline/tabbedbrowser.ui.h | 14 +-- .../auto/tools/uic/baseline/tablewidgeteditor.ui.h | 52 +++++----- tests/auto/tools/uic/baseline/tetrixwindow.ui.h | 16 +-- tests/auto/tools/uic/baseline/textfinder.ui.h | 6 +- tests/auto/tools/uic/baseline/topicchooser.ui.h | 8 +- tests/auto/tools/uic/baseline/translatedialog.ui.h | 32 +++--- .../translation/Dialog_without_Buttons_tr.h | 2 +- .../tools/uic/baseline/translationsettings.ui.h | 8 +- .../auto/tools/uic/baseline/treewidgeteditor.ui.h | 60 +++++------ tests/auto/tools/uic/baseline/trpreviewtool.ui.h | 26 ++--- tests/auto/tools/uic/baseline/validators.ui.h | 28 +++--- .../tools/uic/baseline/wateringconfigdialog.ui.h | 46 ++++----- 103 files changed, 986 insertions(+), 986 deletions(-) diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 518944d9d7..a59c14faf9 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2320,7 +2320,7 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi return QLatin1String("QString()"); QString result; - const QString comment = commentHint.isEmpty() ? QString(QLatin1Char('0')) : fixString(commentHint, m_dindent); + const QString comment = commentHint.isEmpty() ? QString(QLatin1String("Q_NULLPTR")) : fixString(commentHint, m_dindent); if (m_option.translateFunction.isEmpty()) { result = QLatin1String("QApplication::translate(\""); 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 37f02008f1..f63995af24 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", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_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 17647ba5f5..5cee346d35 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", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_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 08b751a34c..05330c9a2a 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", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_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 43459280a4..da2f4c8e07 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", 0)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h index b5bb974423..b812386645 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", 0)); + Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); Alabel->setText(QApplication::translate("Form", "A label.\n" "One new line.\n" "Another new line.\n" -"Last line.", 0)); - groupBox->setTitle(QApplication::translate("Form", "A Group Box", 0)); - pushButton->setText(QApplication::translate("Form", "PushButton", 0)); +"Last line.", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("Form", "A Group Box", Q_NULLPTR)); + pushButton->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h index 5a26984c70..9430d47c00 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", 0)); - label->setText(QApplication::translate("AddLinkDialog", "Title:", 0)); - label_2->setText(QApplication::translate("AddLinkDialog", "URL:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h index 5aca0c4e47..9d40907ad2 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", 0)); - groupBox->setTitle(QApplication::translate("AddTorrentFile", "Select a torrent source", 0)); - label_4->setText(QApplication::translate("AddTorrentFile", "Destination:", 0)); - label_2->setText(QApplication::translate("AddTorrentFile", "Tracker URL:", 0)); - browseTorrents->setText(QApplication::translate("AddTorrentFile", "Browse", 0)); - label_5->setText(QApplication::translate("AddTorrentFile", "File(s):", 0)); - label_3->setText(QApplication::translate("AddTorrentFile", "Size:", 0)); - label_6->setText(QApplication::translate("AddTorrentFile", "Creator:", 0)); - announceUrl->setText(QApplication::translate("AddTorrentFile", "", 0)); - label->setText(QApplication::translate("AddTorrentFile", "Torrent file:", 0)); - browseDestination->setText(QApplication::translate("AddTorrentFile", "Browse", 0)); - label_7->setText(QApplication::translate("AddTorrentFile", "Comment:", 0)); - commentLabel->setText(QApplication::translate("AddTorrentFile", "", 0)); - creatorLabel->setText(QApplication::translate("AddTorrentFile", "", 0)); - sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", 0)); - okButton->setText(QApplication::translate("AddTorrentFile", "&OK", 0)); - cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", 0)); + 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", "", 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", "", Q_NULLPTR)); + creatorLabel->setText(QApplication::translate("AddTorrentFile", "", 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h index ba888c30d6..fbc379a1c1 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", 0)); - label->setText(QApplication::translate("Dialog", "You need to supply a Username and a Password to access this site", 0)); - label_2->setText(QApplication::translate("Dialog", "Username:", 0)); - label_3->setText(QApplication::translate("Dialog", "Password:", 0)); - label_4->setText(QApplication::translate("Dialog", "Site:", 0)); - siteDescription->setText(QApplication::translate("Dialog", "%1 at %2", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/backside.ui.h b/tests/auto/tools/uic/baseline/backside.ui.h index 9ac2d6a442..abbf331182 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", 0)); - groupBox->setTitle(QApplication::translate("BackSide", "Settings", 0)); - label->setText(QApplication::translate("BackSide", "Title:", 0)); - hostName->setText(QApplication::translate("BackSide", "Pad Navigator Example", 0)); - label_2->setText(QApplication::translate("BackSide", "Modified:", 0)); - label_3->setText(QApplication::translate("BackSide", "Extent", 0)); - groupBox_2->setTitle(QApplication::translate("BackSide", "Other input", 0)); + 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)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("BackSide", "Widgets On Graphics View", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("BackSide", "Widgets On Graphics View", Q_NULLPTR)); const bool __sortingEnabled = treeWidget->isSortingEnabled(); treeWidget->setSortingEnabled(false); QTreeWidgetItem *___qtreewidgetitem1 = treeWidget->topLevelItem(0); - ___qtreewidgetitem1->setText(0, QApplication::translate("BackSide", "QGraphicsProxyWidget", 0)); + ___qtreewidgetitem1->setText(0, QApplication::translate("BackSide", "QGraphicsProxyWidget", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem2 = ___qtreewidgetitem1->child(0); - ___qtreewidgetitem2->setText(0, QApplication::translate("BackSide", "QGraphicsWidget", 0)); + ___qtreewidgetitem2->setText(0, QApplication::translate("BackSide", "QGraphicsWidget", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem3 = ___qtreewidgetitem2->child(0); - ___qtreewidgetitem3->setText(0, QApplication::translate("BackSide", "QObject", 0)); + ___qtreewidgetitem3->setText(0, QApplication::translate("BackSide", "QObject", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem4 = ___qtreewidgetitem2->child(1); - ___qtreewidgetitem4->setText(0, QApplication::translate("BackSide", "QGraphicsItem", 0)); + ___qtreewidgetitem4->setText(0, QApplication::translate("BackSide", "QGraphicsItem", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem5 = ___qtreewidgetitem2->child(2); - ___qtreewidgetitem5->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0)); + ___qtreewidgetitem5->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem6 = treeWidget->topLevelItem(1); - ___qtreewidgetitem6->setText(0, QApplication::translate("BackSide", "QGraphicsGridLayout", 0)); + ___qtreewidgetitem6->setText(0, QApplication::translate("BackSide", "QGraphicsGridLayout", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem7 = ___qtreewidgetitem6->child(0); - ___qtreewidgetitem7->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", 0)); + ___qtreewidgetitem7->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem8 = ___qtreewidgetitem7->child(0); - ___qtreewidgetitem8->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0)); + ___qtreewidgetitem8->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem9 = treeWidget->topLevelItem(2); - ___qtreewidgetitem9->setText(0, QApplication::translate("BackSide", "QGraphicsLinearLayout", 0)); + ___qtreewidgetitem9->setText(0, QApplication::translate("BackSide", "QGraphicsLinearLayout", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem10 = ___qtreewidgetitem9->child(0); - ___qtreewidgetitem10->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", 0)); + ___qtreewidgetitem10->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem11 = ___qtreewidgetitem10->child(0); - ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0)); + ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", Q_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 ebc4a5fd9e..dfcce669a5 100644 --- a/tests/auto/tools/uic/baseline/batchtranslation.ui.h +++ b/tests/auto/tools/uic/baseline/batchtranslation.ui.h @@ -221,16 +221,16 @@ public: void retranslateUi(QDialog *databaseTranslationDialog) { - databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", 0)); - groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", 0)); - ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", 0)); - ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", 0)); - groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", 0)); - moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", 0)); - moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", 0)); - label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", 0)); - runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", 0)); - cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h index fa18ba5cda..6e62aeaec5 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", 0)); - label->setText(QApplication::translate("BookmarkDialog", "Bookmark:", 0)); - label_2->setText(QApplication::translate("BookmarkDialog", "Add in Folder:", 0)); - toolButton->setText(QApplication::translate("BookmarkDialog", "+", 0)); + 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)); QTreeWidgetItem *___qtreewidgetitem = bookmarkWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", 0)); - newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", Q_NULLPTR)); + newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bookwindow.ui.h b/tests/auto/tools/uic/baseline/bookwindow.ui.h index 1f498421c9..57ac4b3bdd 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", 0)); - groupBox->setTitle(QApplication::translate("BookWindow", "Books", 0)); - groupBox_2->setTitle(QApplication::translate("BookWindow", "Details", 0)); - label_5->setText(QApplication::translate("BookWindow", "Title:", 0)); - label_2_2_2_2->setText(QApplication::translate("BookWindow", "Author: ", 0)); - label_3->setText(QApplication::translate("BookWindow", "Genre:", 0)); - label_4->setText(QApplication::translate("BookWindow", "Year:", 0)); + 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", "Title:", Q_NULLPTR)); + label_2_2_2_2->setText(QApplication::translate("BookWindow", "Author: ", Q_NULLPTR)); + label_3->setText(QApplication::translate("BookWindow", "Genre:", Q_NULLPTR)); + label_4->setText(QApplication::translate("BookWindow", "Year:", Q_NULLPTR)); yearEdit->setPrefix(QString()); - label->setText(QApplication::translate("BookWindow", "Rating:", 0)); + label->setText(QApplication::translate("BookWindow", "Rating:", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/browserwidget.ui.h b/tests/auto/tools/uic/baseline/browserwidget.ui.h index aa0e6786a0..876e99d504 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", 0)); - insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", 0)); + Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", Q_NULLPTR)); + insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", Q_NULLPTR)); #ifndef QT_NO_STATUSTIP - insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", 0)); + insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", 0)); + deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", Q_NULLPTR)); #ifndef QT_NO_STATUSTIP - deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", 0)); + deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - groupBox->setTitle(QApplication::translate("Browser", "SQL Query", 0)); - clearButton->setText(QApplication::translate("Browser", "&Clear", 0)); - submitButton->setText(QApplication::translate("Browser", "&Submit", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h index 8bee2c3a02..d72ca81be6 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", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("Dialog", "4", 0)); + ___qtreewidgetitem->setText(1, QApplication::translate("Dialog", "4", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h index 7ac878e3fb..88644eaaaf 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", 0)); - backspaceButton->setText(QApplication::translate("Calculator", "Backspace", 0)); - clearButton->setText(QApplication::translate("Calculator", "Clear", 0)); - clearAllButton->setText(QApplication::translate("Calculator", "Clear All", 0)); - clearMemoryButton->setText(QApplication::translate("Calculator", "MC", 0)); - readMemoryButton->setText(QApplication::translate("Calculator", "MR", 0)); - setMemoryButton->setText(QApplication::translate("Calculator", "MS", 0)); - addToMemoryButton->setText(QApplication::translate("Calculator", "M+", 0)); - sevenButton->setText(QApplication::translate("Calculator", "7", 0)); - eightButton->setText(QApplication::translate("Calculator", "8", 0)); - nineButton->setText(QApplication::translate("Calculator", "9", 0)); - fourButton->setText(QApplication::translate("Calculator", "4", 0)); - fiveButton->setText(QApplication::translate("Calculator", "5", 0)); - sixButton->setText(QApplication::translate("Calculator", "6", 0)); - oneButton->setText(QApplication::translate("Calculator", "1", 0)); - twoButton->setText(QApplication::translate("Calculator", "2", 0)); - threeButton->setText(QApplication::translate("Calculator", "3", 0)); - zeroButton->setText(QApplication::translate("Calculator", "0", 0)); - pointButton->setText(QApplication::translate("Calculator", ".", 0)); - changeSignButton->setText(QApplication::translate("Calculator", "+-", 0)); - plusButton->setText(QApplication::translate("Calculator", "+", 0)); - divisionButton->setText(QApplication::translate("Calculator", "/", 0)); - timesButton->setText(QApplication::translate("Calculator", "*", 0)); - minusButton->setText(QApplication::translate("Calculator", "-", 0)); - squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", 0)); - powerButton->setText(QApplication::translate("Calculator", "x^2", 0)); - reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0)); - equalButton->setText(QApplication::translate("Calculator", "=", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/calculatorform.ui.h b/tests/auto/tools/uic/baseline/calculatorform.ui.h index 1383244504..3688c79d04 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", 0)); - label->setText(QApplication::translate("CalculatorForm", "Input 1", 0)); - label_3->setText(QApplication::translate("CalculatorForm", "+", 0)); - label_2->setText(QApplication::translate("CalculatorForm", "Input 2", 0)); - label_3_2->setText(QApplication::translate("CalculatorForm", "=", 0)); - label_2_2_2->setText(QApplication::translate("CalculatorForm", "Output", 0)); - outputWidget->setText(QApplication::translate("CalculatorForm", "0", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h index 9b16110d33..183b89aaff 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", 0)); - groupBox->setTitle(QApplication::translate("CertificateInfo", "Certification Path", 0)); - groupBox_2->setTitle(QApplication::translate("CertificateInfo", "Certificate Information", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatdialog.ui.h b/tests/auto/tools/uic/baseline/chatdialog.ui.h index e917eb9fb1..b678b85eb9 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", 0)); - label->setText(QApplication::translate("ChatDialog", "Message:", 0)); + ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", Q_NULLPTR)); + label->setText(QApplication::translate("ChatDialog", "Message:", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index b3675746bf..8cfd9b4851 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -149,25 +149,25 @@ public: void retranslateUi(QMainWindow *ChatMainWindow) { - ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", 0)); - actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", 0)); - actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", 0)); - actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", 0)); - actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", 0)); - actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", 0)); + ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", Q_NULLPTR)); + actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", Q_NULLPTR)); + actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", Q_NULLPTR)); + actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", Q_NULLPTR)); + actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", Q_NULLPTR)); + actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", 0)); + chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - label->setText(QApplication::translate("ChatMainWindow", "Message:", 0)); + label->setText(QApplication::translate("ChatMainWindow", "Message:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", 0)); + sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS sendButton->setWhatsThis(QString()); #endif // QT_NO_WHATSTHIS - sendButton->setText(QApplication::translate("ChatMainWindow", "Send", 0)); - menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", 0)); - menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", 0)); + sendButton->setText(QApplication::translate("ChatMainWindow", "Send", Q_NULLPTR)); + menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", Q_NULLPTR)); + menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h index e9ebca5f7f..aa023a56fb 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", 0)); - label->setText(QApplication::translate("NicknameDialog", "New nickname:", 0)); - okButton->setText(QApplication::translate("NicknameDialog", "OK", 0)); - cancelButton->setText(QApplication::translate("NicknameDialog", "Cancel", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h index 2d9003b4b9..3e28443913 100644 --- a/tests/auto/tools/uic/baseline/config.ui.h +++ b/tests/auto/tools/uic/baseline/config.ui.h @@ -713,46 +713,46 @@ public: void retranslateUi(QDialog *Config) { - Config->setWindowTitle(QApplication::translate("Config", "Configure", 0)); - ButtonGroup1->setTitle(QApplication::translate("Config", "Size", 0)); - size_176_220->setText(QApplication::translate("Config", "176x220 \"SmartPhone\"", 0)); - size_240_320->setText(QApplication::translate("Config", "240x320 \"PDA\"", 0)); - size_320_240->setText(QApplication::translate("Config", "320x240 \"TV\" / \"QVGA\"", 0)); - size_640_480->setText(QApplication::translate("Config", "640x480 \"VGA\"", 0)); - size_800_600->setText(QApplication::translate("Config", "800x600", 0)); - size_1024_768->setText(QApplication::translate("Config", "1024x768", 0)); - size_custom->setText(QApplication::translate("Config", "Custom", 0)); - ButtonGroup2->setTitle(QApplication::translate("Config", "Depth", 0)); - depth_1->setText(QApplication::translate("Config", "1 bit monochrome", 0)); - depth_4gray->setText(QApplication::translate("Config", "4 bit grayscale", 0)); - depth_8->setText(QApplication::translate("Config", "8 bit", 0)); - depth_12->setText(QApplication::translate("Config", "12 (16) bit", 0)); - depth_15->setText(QApplication::translate("Config", "15 bit", 0)); - depth_16->setText(QApplication::translate("Config", "16 bit", 0)); - depth_18->setText(QApplication::translate("Config", "18 bit", 0)); - depth_24->setText(QApplication::translate("Config", "24 bit", 0)); - depth_32->setText(QApplication::translate("Config", "32 bit", 0)); - depth_32_argb->setText(QApplication::translate("Config", "32 bit ARGB", 0)); - TextLabel1_3->setText(QApplication::translate("Config", "Skin", 0)); + 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->clear(); skin->insertItems(0, QStringList() - << QApplication::translate("Config", "None", 0) + << QApplication::translate("Config", "None", Q_NULLPTR) ); - touchScreen->setText(QApplication::translate("Config", "Emulate touch screen (no mouse move)", 0)); - lcdScreen->setText(QApplication::translate("Config", "Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)", 0)); - TextLabel1->setText(QApplication::translate("Config", "

Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth above. You may freely modify the Gamma below.", 0)); - GroupBox1->setTitle(QApplication::translate("Config", "Gamma", 0)); - TextLabel3->setText(QApplication::translate("Config", "Blue", 0)); - blabel->setText(QApplication::translate("Config", "1.0", 0)); - TextLabel2->setText(QApplication::translate("Config", "Green", 0)); - glabel->setText(QApplication::translate("Config", "1.0", 0)); - TextLabel7->setText(QApplication::translate("Config", "All", 0)); - TextLabel8->setText(QApplication::translate("Config", "1.0", 0)); - TextLabel1_2->setText(QApplication::translate("Config", "Red", 0)); - rlabel->setText(QApplication::translate("Config", "1.0", 0)); - PushButton3->setText(QApplication::translate("Config", "Set all to 1.0", 0)); - buttonOk->setText(QApplication::translate("Config", "&OK", 0)); - buttonCancel->setText(QApplication::translate("Config", "&Cancel", 0)); + 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", "

Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth above. You may freely modify the Gamma below.", 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h index b01238c344..384f406582 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", 0)); - signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", 0)); - editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", 0)); - slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", 0)); - editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", 0)); - showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/controller.ui.h b/tests/auto/tools/uic/baseline/controller.ui.h index e66c3622be..6f3162c5c6 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", 0)); - label->setText(QApplication::translate("Controller", "Controller", 0)); - decelerate->setText(QApplication::translate("Controller", "Decelerate", 0)); - accelerate->setText(QApplication::translate("Controller", "Accelerate", 0)); - right->setText(QApplication::translate("Controller", "Right", 0)); - left->setText(QApplication::translate("Controller", "Left", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/cookies.ui.h b/tests/auto/tools/uic/baseline/cookies.ui.h index a47b2b9969..f1c7a6a4f9 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", 0)); - removeButton->setText(QApplication::translate("CookiesDialog", "&Remove", 0)); - removeAllButton->setText(QApplication::translate("CookiesDialog", "Remove &All Cookies", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h index 0c6c6cf307..a86c40d289 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", 0)); - newExceptionGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "New Exception", 0)); - label->setText(QApplication::translate("CookiesExceptionsDialog", "Domain:", 0)); - blockButton->setText(QApplication::translate("CookiesExceptionsDialog", "Block", 0)); - allowForSessionButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow For Session", 0)); - allowButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow", 0)); - ExceptionsGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "Exceptions", 0)); - removeButton->setText(QApplication::translate("CookiesExceptionsDialog", "&Remove", 0)); - removeAllButton->setText(QApplication::translate("CookiesExceptionsDialog", "Remove &All", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h index b9e1475d70..03d97f86f1 100644 --- a/tests/auto/tools/uic/baseline/default.ui.h +++ b/tests/auto/tools/uic/baseline/default.ui.h @@ -219,88 +219,88 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0)); - exitAction->setText(QApplication::translate("MainWindow", "&Exit", 0)); - aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", 0)); - editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", 0)); - aboutAction->setText(QApplication::translate("MainWindow", "About", 0)); - nameLabel->setText(QApplication::translate("MainWindow", "&Name:", 0)); + 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->clear(); nameCombo->insertItems(0, QStringList() - << QApplication::translate("MainWindow", "Girish", 0) - << QApplication::translate("MainWindow", "Jasmin", 0) - << QApplication::translate("MainWindow", "Simon", 0) - << QApplication::translate("MainWindow", "Zack", 0) + << QApplication::translate("MainWindow", "Girish", Q_NULLPTR) + << QApplication::translate("MainWindow", "Jasmin", Q_NULLPTR) + << QApplication::translate("MainWindow", "Simon", Q_NULLPTR) + << QApplication::translate("MainWindow", "Zack", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", 0)); + nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", 0)); + femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", 0)); + femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", 0)); + agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", 0)); + agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", 0)); + maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", 0)); - genderLabel->setText(QApplication::translate("MainWindow", "Gender:", 0)); + maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", Q_NULLPTR)); + genderLabel->setText(QApplication::translate("MainWindow", "Gender:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", 0)); + ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", 0)); + ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - ageLabel->setText(QApplication::translate("MainWindow", "&Age:", 0)); - passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", 0)); + ageLabel->setText(QApplication::translate("MainWindow", "&Age:", Q_NULLPTR)); + passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", 0)); + passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", 0)); + passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - passwordEdit->setText(QApplication::translate("MainWindow", "Password", 0)); - label->setText(QApplication::translate("MainWindow", "Profession", 0)); - countryLabel->setText(QApplication::translate("MainWindow", "&Country", 0)); + passwordEdit->setText(QApplication::translate("MainWindow", "Password", Q_NULLPTR)); + label->setText(QApplication::translate("MainWindow", "Profession", Q_NULLPTR)); + countryLabel->setText(QApplication::translate("MainWindow", "&Country", Q_NULLPTR)); const bool __sortingEnabled = professionList->isSortingEnabled(); professionList->setSortingEnabled(false); QListWidgetItem *___qlistwidgetitem = professionList->item(0); - ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", 0)); + ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", Q_NULLPTR)); QListWidgetItem *___qlistwidgetitem1 = professionList->item(1); - ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", 0)); + ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", Q_NULLPTR)); QListWidgetItem *___qlistwidgetitem2 = professionList->item(2); - ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", 0)); + ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", Q_NULLPTR)); professionList->setSortingEnabled(__sortingEnabled); #ifndef QT_NO_TOOLTIP - professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", 0)); + professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", 0)); + professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_WHATSTHIS - professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", 0)); + professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS countryCombo->clear(); countryCombo->insertItems(0, QStringList() - << QApplication::translate("MainWindow", "Germany", 0) - << QApplication::translate("MainWindow", "India", 0) - << QApplication::translate("MainWindow", "Norway", 0) - << QApplication::translate("MainWindow", "United States Of America", 0) - << QApplication::translate("MainWindow", "United Kingdom", 0) + << QApplication::translate("MainWindow", "Germany", Q_NULLPTR) + << QApplication::translate("MainWindow", "India", Q_NULLPTR) + << QApplication::translate("MainWindow", "Norway", Q_NULLPTR) + << QApplication::translate("MainWindow", "United States Of America", Q_NULLPTR) + << QApplication::translate("MainWindow", "United Kingdom", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", 0)); + countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", 0)); + countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0)); - menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", 0)); + menu_File->setTitle(QApplication::translate("MainWindow", "&File", Q_NULLPTR)); + menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/dialog.ui.h b/tests/auto/tools/uic/baseline/dialog.ui.h index ef587f9d9d..88ca359e20 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", 0)); - loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", 0)); - 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.", 0)); - loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/downloaditem.ui.h b/tests/auto/tools/uic/baseline/downloaditem.ui.h index b0f5106246..87f2efe3eb 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", 0)); - fileIcon->setText(QApplication::translate("DownloadItem", "Ico", 0)); - fileNameLabel->setProperty("text", QVariant(QApplication::translate("DownloadItem", "Filename", 0))); + 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))); downloadInfoLabel->setProperty("text", QVariant(QString())); - tryAgainButton->setText(QApplication::translate("DownloadItem", "Try Again", 0)); - stopButton->setText(QApplication::translate("DownloadItem", "Stop", 0)); - openButton->setText(QApplication::translate("DownloadItem", "Open", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/downloads.ui.h b/tests/auto/tools/uic/baseline/downloads.ui.h index 7e688669e4..4fbcceb7b4 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", 0)); - cleanupButton->setText(QApplication::translate("DownloadDialog", "Clean up", 0)); - itemCount->setText(QApplication::translate("DownloadDialog", "0 Items", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h index 872dc7db87..69027286b6 100644 --- a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h +++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h @@ -98,16 +98,16 @@ public: void retranslateUi(QDialog *embeddedDialog) { - embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", 0)); - label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", 0)); + embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", Q_NULLPTR)); + label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", Q_NULLPTR)); layoutDirection->clear(); layoutDirection->insertItems(0, QStringList() - << QApplication::translate("embeddedDialog", "Left to Right", 0) - << QApplication::translate("embeddedDialog", "Right to Left", 0) + << QApplication::translate("embeddedDialog", "Left to Right", Q_NULLPTR) + << QApplication::translate("embeddedDialog", "Right to Left", Q_NULLPTR) ); - label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", 0)); - label_3->setText(QApplication::translate("embeddedDialog", "Style:", 0)); - label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/enumnostdset.ui.h b/tests/auto/tools/uic/baseline/enumnostdset.ui.h index 89a8411b4a..2c7d4cb591 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", 0)); + Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filespage.ui.h b/tests/auto/tools/uic/baseline/filespage.ui.h index ee4f702233..d84d609e01 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", 0)); - fileLabel->setText(QApplication::translate("FilesPage", "Files:", 0)); - removeButton->setText(QApplication::translate("FilesPage", "Remove", 0)); - removeAllButton->setText(QApplication::translate("FilesPage", "Remove All", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filternamedialog.ui.h b/tests/auto/tools/uic/baseline/filternamedialog.ui.h index 7b10ceb7ec..b789b9045b 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", 0)); - label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", 0)); + FilterNameDialogClass->setWindowTitle(QApplication::translate("FilterNameDialogClass", "FilterNameDialog", Q_NULLPTR)); + label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/filterpage.ui.h b/tests/auto/tools/uic/baseline/filterpage.ui.h index fb12686a83..d2e37dc5a4 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", 0)); - label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", 0)); - groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", 0)); + 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)); QTreeWidgetItem *___qtreewidgetitem = customFilterWidget->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", 0)); - ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", 0)); - addButton->setText(QApplication::translate("FilterPage", "Add", 0)); - removeButton->setText(QApplication::translate("FilterPage", "Remove", 0)); + ___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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h index 259d36569f..404ad249af 100644 --- a/tests/auto/tools/uic/baseline/finddialog.ui.h +++ b/tests/auto/tools/uic/baseline/finddialog.ui.h @@ -201,40 +201,40 @@ public: void retranslateUi(QDialog *FindDialog) { - FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Find", 0)); + FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Find", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - FindDialog->setWhatsThis(QApplication::translate("FindDialog", "This window allows you to search for some text in the translation source file.", 0)); + FindDialog->setWhatsThis(QApplication::translate("FindDialog", "This window allows you to search for some text in the translation source file.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - findWhat->setText(QApplication::translate("FindDialog", "&Find what:", 0)); + findWhat->setText(QApplication::translate("FindDialog", "&Find what:", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - led->setWhatsThis(QApplication::translate("FindDialog", "Type in the text to search for.", 0)); + led->setWhatsThis(QApplication::translate("FindDialog", "Type in the text to search for.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - groupBox->setTitle(QApplication::translate("FindDialog", "Options", 0)); + groupBox->setTitle(QApplication::translate("FindDialog", "Options", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - sourceText->setWhatsThis(QApplication::translate("FindDialog", "Source texts are searched when checked.", 0)); + sourceText->setWhatsThis(QApplication::translate("FindDialog", "Source texts are searched when checked.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - sourceText->setText(QApplication::translate("FindDialog", "&Source texts", 0)); + sourceText->setText(QApplication::translate("FindDialog", "&Source texts", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - translations->setWhatsThis(QApplication::translate("FindDialog", "Translations are searched when checked.", 0)); + translations->setWhatsThis(QApplication::translate("FindDialog", "Translations are searched when checked.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - translations->setText(QApplication::translate("FindDialog", "&Translations", 0)); + translations->setText(QApplication::translate("FindDialog", "&Translations", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - matchCase->setWhatsThis(QApplication::translate("FindDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", 0)); + matchCase->setWhatsThis(QApplication::translate("FindDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - matchCase->setText(QApplication::translate("FindDialog", "&Match case", 0)); + matchCase->setText(QApplication::translate("FindDialog", "&Match case", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - comments->setWhatsThis(QApplication::translate("FindDialog", "Comments and contexts are searched when checked.", 0)); + comments->setWhatsThis(QApplication::translate("FindDialog", "Comments and contexts are searched when checked.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - comments->setText(QApplication::translate("FindDialog", "&Comments", 0)); - ignoreAccelerators->setText(QApplication::translate("FindDialog", "Ignore &accelerators", 0)); + comments->setText(QApplication::translate("FindDialog", "&Comments", Q_NULLPTR)); + ignoreAccelerators->setText(QApplication::translate("FindDialog", "Ignore &accelerators", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - findNxt->setWhatsThis(QApplication::translate("FindDialog", "Click here to find the next occurrence of the text you typed in.", 0)); + findNxt->setWhatsThis(QApplication::translate("FindDialog", "Click here to find the next occurrence of the text you typed in.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - findNxt->setText(QApplication::translate("FindDialog", "Find Next", 0)); + findNxt->setText(QApplication::translate("FindDialog", "Find Next", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", 0)); + cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - cancel->setText(QApplication::translate("FindDialog", "Cancel", 0)); + cancel->setText(QApplication::translate("FindDialog", "Cancel", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/form.ui.h b/tests/auto/tools/uic/baseline/form.ui.h index 0b82a41f5d..89a08c2050 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", 0)); - label->setText(QApplication::translate("WorldTimeForm", "Current time:", 0)); - label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h index f4f2c9fe8e..71f9477712 100644 --- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h @@ -279,17 +279,17 @@ public: void retranslateUi(QDialog *FormWindowSettings) { - FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", 0)); - layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", 0)); - label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", 0)); - label->setText(QApplication::translate("FormWindowSettings", "&Margin:", 0)); - layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", 0)); - label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", 0)); - label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", 0)); - pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", 0)); - includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", 0)); - pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", 0)); - gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/generalpage.ui.h b/tests/auto/tools/uic/baseline/generalpage.ui.h index ec51c40ab5..6cdc6f812e 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", 0)); - label->setText(QApplication::translate("GeneralPage", "Namespace:", 0)); - label_2->setText(QApplication::translate("GeneralPage", "Virtual Folder:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/gridalignment.ui.h b/tests/auto/tools/uic/baseline/gridalignment.ui.h index 8e82d5460d..3513e0e727 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", 0)); - pushButton->setText(QApplication::translate("Form", "Left", 0)); - pushButton_3->setText(QApplication::translate("Form", "Top", 0)); - pushButton_2->setText(QApplication::translate("Form", "Right", 0)); - pushButton_4->setText(QApplication::translate("Form", "Bottom", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/gridpanel.ui.h b/tests/auto/tools/uic/baseline/gridpanel.ui.h index c289914aaf..2c61c7228b 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", 0)); - m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", 0)); - m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", 0)); - label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", 0)); - m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0)); - m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", 0)); - m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/helpdialog.ui.h b/tests/auto/tools/uic/baseline/helpdialog.ui.h index 15f3d77b2a..c1d7f8286a 100644 --- a/tests/auto/tools/uic/baseline/helpdialog.ui.h +++ b/tests/auto/tools/uic/baseline/helpdialog.ui.h @@ -303,77 +303,77 @@ public: void retranslateUi(QWidget *HelpDialog) { - HelpDialog->setWindowTitle(QApplication::translate("HelpDialog", "Help", 0)); + HelpDialog->setWindowTitle(QApplication::translate("HelpDialog", "Help", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "Help

Choose the topic you want help on from the contents list, or search the index for keywords.

", 0)); + HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "Help

Choose the topic you want help on from the contents list, or search the index for keywords.

", Q_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.", 0)); + tabWidget->setWhatsThis(QApplication::translate("HelpDialog", "Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS QTreeWidgetItem *___qtreewidgetitem = listContents->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("HelpDialog", "column 1", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("HelpDialog", "column 1", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - listContents->setWhatsThis(QApplication::translate("HelpDialog", "Help topics organized by category.

Double-click an item to see the topics in that category. To view a topic, just double-click it.

", 0)); + listContents->setWhatsThis(QApplication::translate("HelpDialog", "Help topics organized by category.

Double-click an item to see the topics in that category. To view a topic, just double-click it.

", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - tabWidget->setTabText(tabWidget->indexOf(contentPage), QApplication::translate("HelpDialog", "Con&tents", 0)); - TextLabel1->setText(QApplication::translate("HelpDialog", "&Look For:", 0)); + tabWidget->setTabText(tabWidget->indexOf(contentPage), QApplication::translate("HelpDialog", "Con&tents", Q_NULLPTR)); + TextLabel1->setText(QApplication::translate("HelpDialog", "&Look For:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - editIndex->setToolTip(QApplication::translate("HelpDialog", "Enter keyword", 0)); + editIndex->setToolTip(QApplication::translate("HelpDialog", "Enter keyword", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - editIndex->setWhatsThis(QApplication::translate("HelpDialog", "Enter a keyword.

The list will select an item that matches the entered string best.

", 0)); + editIndex->setWhatsThis(QApplication::translate("HelpDialog", "Enter a keyword.

The list will select an item that matches the entered string best.

", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - listIndex->setWhatsThis(QApplication::translate("HelpDialog", "List of available help topics.

Double-click on an item to open its help page. If more than one is found, you must specify which page you want.

", 0)); + listIndex->setWhatsThis(QApplication::translate("HelpDialog", "List of available help topics.

Double-click on an item to open its help page. If more than one is found, you must specify which page you want.

", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - tabWidget->setTabText(tabWidget->indexOf(indexPage), QApplication::translate("HelpDialog", "&Index", 0)); + tabWidget->setTabText(tabWidget->indexOf(indexPage), QApplication::translate("HelpDialog", "&Index", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem1 = listBookmarks->headerItem(); - ___qtreewidgetitem1->setText(0, QApplication::translate("HelpDialog", "column 1", 0)); + ___qtreewidgetitem1->setText(0, QApplication::translate("HelpDialog", "column 1", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - listBookmarks->setWhatsThis(QApplication::translate("HelpDialog", "Displays the list of bookmarks.", 0)); + listBookmarks->setWhatsThis(QApplication::translate("HelpDialog", "Displays the list of bookmarks.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_TOOLTIP - buttonAdd->setToolTip(QApplication::translate("HelpDialog", "Add new bookmark", 0)); + buttonAdd->setToolTip(QApplication::translate("HelpDialog", "Add new bookmark", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - buttonAdd->setWhatsThis(QApplication::translate("HelpDialog", "Add the currently displayed page as a new bookmark.", 0)); + buttonAdd->setWhatsThis(QApplication::translate("HelpDialog", "Add the currently displayed page as a new bookmark.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - buttonAdd->setText(QApplication::translate("HelpDialog", "&New", 0)); + buttonAdd->setText(QApplication::translate("HelpDialog", "&New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - buttonRemove->setToolTip(QApplication::translate("HelpDialog", "Delete bookmark", 0)); + buttonRemove->setToolTip(QApplication::translate("HelpDialog", "Delete bookmark", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - buttonRemove->setWhatsThis(QApplication::translate("HelpDialog", "Delete the selected bookmark.", 0)); + buttonRemove->setWhatsThis(QApplication::translate("HelpDialog", "Delete the selected bookmark.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - buttonRemove->setText(QApplication::translate("HelpDialog", "&Delete", 0)); - tabWidget->setTabText(tabWidget->indexOf(bookmarkPage), QApplication::translate("HelpDialog", "&Bookmarks", 0)); - TextLabel1_2->setText(QApplication::translate("HelpDialog", "Searching f&or:", 0)); + 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)); #ifndef QT_NO_TOOLTIP - termsEdit->setToolTip(QApplication::translate("HelpDialog", "Enter searchword(s).", 0)); + termsEdit->setToolTip(QApplication::translate("HelpDialog", "Enter searchword(s).", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "Enter search word(s).

Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.

", 0)); + termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "Enter search word(s).

Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.

", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - resultBox->setWhatsThis(QApplication::translate("HelpDialog", "Found documents

This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.

", 0)); + resultBox->setWhatsThis(QApplication::translate("HelpDialog", "Found documents

This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.

", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - TextLabel2->setText(QApplication::translate("HelpDialog", "Found &Documents:", 0)); + TextLabel2->setText(QApplication::translate("HelpDialog", "Found &Documents:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - helpButton->setToolTip(QApplication::translate("HelpDialog", "Display the help page.", 0)); + helpButton->setToolTip(QApplication::translate("HelpDialog", "Display the help page.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - helpButton->setWhatsThis(QApplication::translate("HelpDialog", "Display the help page for the full text search.", 0)); + helpButton->setWhatsThis(QApplication::translate("HelpDialog", "Display the help page for the full text search.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - helpButton->setText(QApplication::translate("HelpDialog", "He&lp", 0)); + helpButton->setText(QApplication::translate("HelpDialog", "He&lp", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - searchButton->setToolTip(QApplication::translate("HelpDialog", "Start searching.", 0)); + searchButton->setToolTip(QApplication::translate("HelpDialog", "Start searching.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS - searchButton->setWhatsThis(QApplication::translate("HelpDialog", "Pressing this button starts the search.", 0)); + searchButton->setWhatsThis(QApplication::translate("HelpDialog", "Pressing this button starts the search.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - searchButton->setText(QApplication::translate("HelpDialog", "&Search", 0)); - tabWidget->setTabText(tabWidget->indexOf(searchPage), QApplication::translate("HelpDialog", "&Search", 0)); - labelPrepare->setText(QApplication::translate("HelpDialog", "Preparing...", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/history.ui.h b/tests/auto/tools/uic/baseline/history.ui.h index e4c4c7d1b5..b0eccba5bc 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", 0)); - removeButton->setText(QApplication::translate("HistoryDialog", "&Remove", 0)); - removeAllButton->setText(QApplication::translate("HistoryDialog", "Remove &All", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h index 28fd27475d..f9cc837761 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", 0)); - fileicon->setText(QApplication::translate("Form", "fileicon", 0)); - fileandthemeicon->setText(QApplication::translate("Form", "PushButton", 0)); - themeicon->setText(QApplication::translate("Form", "PushButton", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/identifierpage.ui.h b/tests/auto/tools/uic/baseline/identifierpage.ui.h index 9f92608c62..68649a8a9e 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", 0)); - identifierCheckBox->setText(QApplication::translate("IdentifierPage", "Create identifiers", 0)); - globalButton->setText(QApplication::translate("IdentifierPage", "Global prefix:", 0)); - fileNameButton->setText(QApplication::translate("IdentifierPage", "Inherit prefix from file names", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h index 99e853b7a8..9ce2a577f0 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", 0)); - widthLabel->setText(QApplication::translate("ImageDialog", "Width:", 0)); - heightLabel->setText(QApplication::translate("ImageDialog", "Height:", 0)); - nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", 0)); - nameLabel->setText(QApplication::translate("ImageDialog", "Name:", 0)); - colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", 0)); - okButton->setText(QApplication::translate("ImageDialog", "OK", 0)); - cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/inputpage.ui.h b/tests/auto/tools/uic/baseline/inputpage.ui.h index b064f94c20..ad97dfcf85 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", 0)); - label->setText(QApplication::translate("InputPage", "File name:", 0)); - browseButton->setText(QApplication::translate("InputPage", "...", 0)); + InputPage->setWindowTitle(QApplication::translate("InputPage", "Form", Q_NULLPTR)); + label->setText(QApplication::translate("InputPage", "File name:", Q_NULLPTR)); + browseButton->setText(QApplication::translate("InputPage", "...", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h index 6ba51c7404..5bbd7b6f08 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", 0)); - label->setText(QApplication::translate("InstallDialog", "Available Documentation:", 0)); - installButton->setText(QApplication::translate("InstallDialog", "Install", 0)); - cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", 0)); - closeButton->setText(QApplication::translate("InstallDialog", "Close", 0)); - label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", 0)); - browseButton->setText(QApplication::translate("InstallDialog", "...", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h index dfdc1d1ac6..7d22656471 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", 0)); + LanguagesDialog->setWindowTitle(QApplication::translate("LanguagesDialog", "Auxiliary Languages", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = languagesList->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("LanguagesDialog", "File", 0)); - ___qtreewidgetitem->setText(0, QApplication::translate("LanguagesDialog", "Locale", 0)); + ___qtreewidgetitem->setText(1, QApplication::translate("LanguagesDialog", "File", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("LanguagesDialog", "Locale", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP upButton->setToolTip(QApplication::translate("LanguagesDialog", "\n" -"

Move selected language up

", 0)); +"

Move selected language up

", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("LanguagesDialog", "up", 0)); + upButton->setText(QApplication::translate("LanguagesDialog", "up", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP downButton->setToolTip(QApplication::translate("LanguagesDialog", "\n" -"

Move selected language down

", 0)); +"

Move selected language down

", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("LanguagesDialog", "down", 0)); + downButton->setText(QApplication::translate("LanguagesDialog", "down", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP removeButton->setToolTip(QApplication::translate("LanguagesDialog", "\n" -"

Remove selected language

", 0)); +"

Remove selected language

", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeButton->setText(QApplication::translate("LanguagesDialog", "remove", 0)); + removeButton->setText(QApplication::translate("LanguagesDialog", "remove", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP openFileButton->setToolTip(QApplication::translate("LanguagesDialog", "\n" -"

Open auxiliary language files

", 0)); +"

Open auxiliary language files

", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - openFileButton->setText(QApplication::translate("LanguagesDialog", "...", 0)); - okButton->setText(QApplication::translate("LanguagesDialog", "OK", 0)); + openFileButton->setText(QApplication::translate("LanguagesDialog", "...", Q_NULLPTR)); + okButton->setText(QApplication::translate("LanguagesDialog", "OK", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h index 329a5d370d..62acc2ba9e 100644 --- a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h @@ -180,28 +180,28 @@ public: void retranslateUi(QDialog *qdesigner_internal__ListWidgetEditor) { - qdesigner_internal__ListWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Dialog", 0)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", 0)); + qdesigner_internal__ListWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Dialog", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - listWidget->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", 0)); + listWidget->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "New Item", 0)); + newItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "New Item", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&New", 0)); + newItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Delete Item", 0)); + deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Delete Item", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&Delete", 0)); + deleteItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&Delete", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Up", 0)); + moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemUpButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "U", 0)); + moveItemUpButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "U", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Down", 0)); + moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", 0)); - label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", 0)); + moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", Q_NULLPTR)); + label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/mainwindow.ui.h b/tests/auto/tools/uic/baseline/mainwindow.ui.h index bb6c8641a1..62b1e8766c 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", 0)); - actionAdd_Custom_Font->setText(QApplication::translate("MainWindow", "&Add Custom Font...", 0)); - action_Exit->setText(QApplication::translate("MainWindow", "&Exit", 0)); - groupBox->setTitle(QApplication::translate("MainWindow", "Font Properties", 0)); - label->setText(QApplication::translate("MainWindow", "Family:", 0)); - label_2->setText(QApplication::translate("MainWindow", "Pixel Size:", 0)); - label_7->setText(QApplication::translate("MainWindow", "Weight:", 0)); - italic->setText(QApplication::translate("MainWindow", "Italic", 0)); - groupBox_2->setTitle(QApplication::translate("MainWindow", "Glyph Coverage", 0)); - chooseFromCodePoints->setText(QApplication::translate("MainWindow", "Choose from Unicode Codepoints:", 0)); - selectAll->setText(QApplication::translate("MainWindow", "Select &All", 0)); - deselectAll->setText(QApplication::translate("MainWindow", "&Deselect All", 0)); - invertSelection->setText(QApplication::translate("MainWindow", "&Invert Selection", 0)); - chooseFromSampleFile->setText(QApplication::translate("MainWindow", "Choose from Sample Text File (UTF-8 Encoded):", 0)); - label_5->setText(QApplication::translate("MainWindow", "Path:", 0)); - browseSampleFile->setText(QApplication::translate("MainWindow", "Browse...", 0)); - charCount->setText(QApplication::translate("MainWindow", "TextLabel", 0)); - groupBox_3->setTitle(QApplication::translate("MainWindow", "Preview", 0)); - groupBox_4->setTitle(QApplication::translate("MainWindow", "Output Options", 0)); - label_3->setText(QApplication::translate("MainWindow", "Path:", 0)); - browsePath->setText(QApplication::translate("MainWindow", "Browse...", 0)); - label_4->setText(QApplication::translate("MainWindow", "Filename:", 0)); - generate->setText(QApplication::translate("MainWindow", "Generate Pre-Rendered Font...", 0)); - menuFile->setTitle(QApplication::translate("MainWindow", "File", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/mydialog.ui.h b/tests/auto/tools/uic/baseline/mydialog.ui.h index 6f2462611b..061b476f63 100644 --- a/tests/auto/tools/uic/baseline/mydialog.ui.h +++ b/tests/auto/tools/uic/baseline/mydialog.ui.h @@ -59,10 +59,10 @@ public: void retranslateUi(QDialog *MyDialog) { - MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", 0)); - aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", 0)); - aButton->setText(QApplication::translate("MyDialog", "&Quit", 0)); - aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", 0)); + 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)); + aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/myform.ui.h b/tests/auto/tools/uic/baseline/myform.ui.h index 4c58bceed9..6e7873c5ad 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", 0)); - groupBox->setTitle(QApplication::translate("Form", "Export Options", 0)); - radioButton_2->setText(QApplication::translate("Form", "&DocBook", 0)); - radioButton->setText(QApplication::translate("Form", "&LaTeX", 0)); - checkBox_2->setText(QApplication::translate("Form", "Include p&ictures", 0)); - checkBox->setText(QApplication::translate("Form", "&Compress", 0)); - radioButton_2_2->setText(QApplication::translate("Form", "&HTML", 0)); - radioButton_3->setText(QApplication::translate("Form", "&PostScript", 0)); - radioButton_4->setText(QApplication::translate("Form", "PD&F", 0)); - checkBox_3->setText(QApplication::translate("Form", "Include &metadata", 0)); - checkBox_4->setText(QApplication::translate("Form", "Create inde&x", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h index 7d43379d28..eab492eaba 100644 --- a/tests/auto/tools/uic/baseline/newactiondialog.ui.h +++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h @@ -167,10 +167,10 @@ public: void retranslateUi(QDialog *qdesigner_internal__NewActionDialog) { - qdesigner_internal__NewActionDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewActionDialog", "New Action...", 0)); - label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", 0)); - label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h index 3c4e0ba09e..43a7250737 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", 0)); - label->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Name", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Type", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/newform.ui.h b/tests/auto/tools/uic/baseline/newform.ui.h index c5eb226322..f1ec2f02a4 100644 --- a/tests/auto/tools/uic/baseline/newform.ui.h +++ b/tests/auto/tools/uic/baseline/newform.ui.h @@ -139,11 +139,11 @@ public: void retranslateUi(QDialog *NewForm) { - NewForm->setWindowTitle(QApplication::translate("NewForm", "New Form", 0)); + NewForm->setWindowTitle(QApplication::translate("NewForm", "New Form", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("NewForm", "0", 0)); - lblPreview->setText(QApplication::translate("NewForm", "Choose a template for a preview", 0)); - chkShowOnStartup->setText(QApplication::translate("NewForm", "Show this Dialog on Startup", 0)); + ___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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h index d51273e664..e9655dc95a 100644 --- a/tests/auto/tools/uic/baseline/orderdialog.ui.h +++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h @@ -138,13 +138,13 @@ public: void retranslateUi(QDialog *qdesigner_internal__OrderDialog) { - qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", 0)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", 0)); + 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)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", 0)); + upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", 0)); + downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", Q_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 4adb76e642..6d0c392f7e 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", 0)); - label->setText(QApplication::translate("OutputPage", "Project file name:", 0)); - label_2->setText(QApplication::translate("OutputPage", "Collection file name:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/pagefold.ui.h b/tests/auto/tools/uic/baseline/pagefold.ui.h index e9ec66f4e9..b82c8d7fbd 100644 --- a/tests/auto/tools/uic/baseline/pagefold.ui.h +++ b/tests/auto/tools/uic/baseline/pagefold.ui.h @@ -233,88 +233,88 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0)); - exitAction->setText(QApplication::translate("MainWindow", "&Exit", 0)); - aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", 0)); - editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", 0)); - aboutAction->setText(QApplication::translate("MainWindow", "About", 0)); + 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->clear(); nameCombo->insertItems(0, QStringList() - << QApplication::translate("MainWindow", "Girish", 0) - << QApplication::translate("MainWindow", "Jasmin", 0) - << QApplication::translate("MainWindow", "Simon", 0) - << QApplication::translate("MainWindow", "Zack", 0) + << QApplication::translate("MainWindow", "Girish", Q_NULLPTR) + << QApplication::translate("MainWindow", "Jasmin", Q_NULLPTR) + << QApplication::translate("MainWindow", "Simon", Q_NULLPTR) + << QApplication::translate("MainWindow", "Zack", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", 0)); + nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - femaleRadioButton->setStyleSheet(QApplication::translate("MainWindow", "Check this if you are female", 0)); - femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", 0)); - genderLabel->setText(QApplication::translate("MainWindow", "Gender:", 0)); - ageLabel->setText(QApplication::translate("MainWindow", "&Age:", 0)); + 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)); #ifndef QT_NO_TOOLTIP - maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", 0)); + maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", 0)); - nameLabel->setText(QApplication::translate("MainWindow", "&Name:", 0)); - passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", 0)); + maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", Q_NULLPTR)); + nameLabel->setText(QApplication::translate("MainWindow", "&Name:", Q_NULLPTR)); + passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", 0)); + ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age", 0)); + ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_TOOLTIP - agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the LICENSE file before checking", 0)); + agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the LICENSE file before checking", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and &conditions", 0)); + agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and &conditions", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", 0)); + passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password", 0)); + passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - passwordEdit->setText(QApplication::translate("MainWindow", "Password", 0)); + passwordEdit->setText(QApplication::translate("MainWindow", "Password", Q_NULLPTR)); const bool __sortingEnabled = professionList->isSortingEnabled(); professionList->setSortingEnabled(false); QListWidgetItem *___qlistwidgetitem = professionList->item(0); - ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", 0)); + ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", Q_NULLPTR)); QListWidgetItem *___qlistwidgetitem1 = professionList->item(1); - ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", 0)); + ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", Q_NULLPTR)); QListWidgetItem *___qlistwidgetitem2 = professionList->item(2); - ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", 0)); + ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", Q_NULLPTR)); professionList->setSortingEnabled(__sortingEnabled); #ifndef QT_NO_TOOLTIP - professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", 0)); + professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - professionList->setStatusTip(QApplication::translate("MainWindow", "Specify your name here", 0)); + professionList->setStatusTip(QApplication::translate("MainWindow", "Specify your name here", Q_NULLPTR)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_WHATSTHIS - professionList->setWhatsThis(QApplication::translate("MainWindow", "Specify your name here", 0)); + professionList->setWhatsThis(QApplication::translate("MainWindow", "Specify your name here", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - label->setText(QApplication::translate("MainWindow", "Profession:", 0)); + label->setText(QApplication::translate("MainWindow", "Profession:", Q_NULLPTR)); countryCombo->clear(); countryCombo->insertItems(0, QStringList() - << QApplication::translate("MainWindow", "Egypt", 0) - << QApplication::translate("MainWindow", "France", 0) - << QApplication::translate("MainWindow", "Germany", 0) - << QApplication::translate("MainWindow", "India", 0) - << QApplication::translate("MainWindow", "Italy", 0) - << QApplication::translate("MainWindow", "Korea", 0) - << QApplication::translate("MainWindow", "Norway", 0) + << QApplication::translate("MainWindow", "Egypt", Q_NULLPTR) + << QApplication::translate("MainWindow", "France", Q_NULLPTR) + << QApplication::translate("MainWindow", "Germany", Q_NULLPTR) + << QApplication::translate("MainWindow", "India", Q_NULLPTR) + << QApplication::translate("MainWindow", "Italy", Q_NULLPTR) + << QApplication::translate("MainWindow", "Korea", Q_NULLPTR) + << QApplication::translate("MainWindow", "Norway", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify country of origin", 0)); + countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify country of origin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify country of origin", 0)); + countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify country of origin", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - countryLabel->setText(QApplication::translate("MainWindow", "Pro&fession", 0)); - menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0)); - menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/paletteeditor.ui.h b/tests/auto/tools/uic/baseline/paletteeditor.ui.h index 85d5bff8fb..8bd94ae7f8 100644 --- a/tests/auto/tools/uic/baseline/paletteeditor.ui.h +++ b/tests/auto/tools/uic/baseline/paletteeditor.ui.h @@ -204,16 +204,16 @@ public: void retranslateUi(QDialog *qdesigner_internal__PaletteEditor) { - qdesigner_internal__PaletteEditor->setWindowTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Edit Palette", 0)); - advancedBox->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Tune Palette", 0)); + qdesigner_internal__PaletteEditor->setWindowTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Edit Palette", Q_NULLPTR)); + advancedBox->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Tune Palette", Q_NULLPTR)); buildButton->setText(QString()); - detailsRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Show Details", 0)); - computeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Compute Details", 0)); - label->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Quick", 0)); - GroupBox126->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Preview", 0)); - disabledRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Disabled", 0)); - inactiveRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Inactive", 0)); - activeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Active", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/passworddialog.ui.h b/tests/auto/tools/uic/baseline/passworddialog.ui.h index b99954ab88..a9c9ed842f 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", 0)); - iconLabel->setText(QApplication::translate("PasswordDialog", "DUMMY ICON", 0)); - introLabel->setText(QApplication::translate("PasswordDialog", "INTRO TEXT DUMMY", 0)); - label->setText(QApplication::translate("PasswordDialog", "Username:", 0)); - lblPassword->setText(QApplication::translate("PasswordDialog", "Password:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/pathpage.ui.h b/tests/auto/tools/uic/baseline/pathpage.ui.h index 018e62c091..10a11d5fbd 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", 0)); - label_2->setText(QApplication::translate("PathPage", "File filters:", 0)); - label->setText(QApplication::translate("PathPage", "Documentation source file paths:", 0)); - addButton->setText(QApplication::translate("PathPage", "Add", 0)); - removeButton->setText(QApplication::translate("PathPage", "Remove", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h index 0fb6522be8..caf80e7dda 100644 --- a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h +++ b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h @@ -191,38 +191,38 @@ public: void retranslateUi(QDialog *PhraseBookBox) { - PhraseBookBox->setWindowTitle(QApplication::translate("PhraseBookBox", "Edit Phrase Book", 0)); + PhraseBookBox->setWindowTitle(QApplication::translate("PhraseBookBox", "Edit Phrase Book", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - PhraseBookBox->setWhatsThis(QApplication::translate("PhraseBookBox", "This window allows you to add, modify, or delete phrases in a phrase book.", 0)); + PhraseBookBox->setWhatsThis(QApplication::translate("PhraseBookBox", "This window allows you to add, modify, or delete phrases in a phrase book.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - target->setText(QApplication::translate("PhraseBookBox", "&Translation:", 0)); + target->setText(QApplication::translate("PhraseBookBox", "&Translation:", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - targetLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the target language corresponding to the source phrase.", 0)); + targetLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the target language corresponding to the source phrase.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - source->setText(QApplication::translate("PhraseBookBox", "S&ource phrase:", 0)); + source->setText(QApplication::translate("PhraseBookBox", "S&ource phrase:", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - definitionLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is a definition for the source phrase.", 0)); + definitionLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is a definition for the source phrase.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - sourceLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the source language.", 0)); + sourceLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the source language.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - definition->setText(QApplication::translate("PhraseBookBox", "&Definition:", 0)); + definition->setText(QApplication::translate("PhraseBookBox", "&Definition:", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - newBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to add the phrase to the phrase book.", 0)); + newBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to add the phrase to the phrase book.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - newBut->setText(QApplication::translate("PhraseBookBox", "&New Phrase", 0)); + newBut->setText(QApplication::translate("PhraseBookBox", "&New Phrase", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - removeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to remove the phrase from the phrase book.", 0)); + removeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to remove the phrase from the phrase book.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - removeBut->setText(QApplication::translate("PhraseBookBox", "&Remove Phrase", 0)); + removeBut->setText(QApplication::translate("PhraseBookBox", "&Remove Phrase", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - saveBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to save the changes made.", 0)); + saveBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to save the changes made.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - saveBut->setText(QApplication::translate("PhraseBookBox", "&Save", 0)); + saveBut->setText(QApplication::translate("PhraseBookBox", "&Save", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", 0)); + closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - closeBut->setText(QApplication::translate("PhraseBookBox", "Close", 0)); + closeBut->setText(QApplication::translate("PhraseBookBox", "Close", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h index 1553e910b4..312c48565c 100644 --- a/tests/auto/tools/uic/baseline/plugindialog.ui.h +++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h @@ -118,11 +118,11 @@ public: void retranslateUi(QDialog *PluginDialog) { - PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", 0)); - label->setText(QApplication::translate("PluginDialog", "TextLabel", 0)); + PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", Q_NULLPTR)); + label->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", 0)); - message->setText(QApplication::translate("PluginDialog", "TextLabel", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", Q_NULLPTR)); + message->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h index 2c4d08c547..078d13a7f5 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", 0)); - m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", 0)); - m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", 0)); - m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0)); - m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h index 11051c7a15..3209e203e8 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", 0)); - PreviewConfigurationWidget->setTitle(QApplication::translate("PreviewConfigurationWidget", "Print/Preview Configuration", 0)); - m_styleLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style", 0)); - m_appStyleSheetLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style sheet", 0)); - m_appStyleSheetChangeButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0)); - m_appStyleSheetClearButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0)); - m_skinLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Device skin", 0)); - m_skinRemoveButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h index d717ac91af..de046d575a 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", 0)); - label->setText(QApplication::translate("PreviewDialogBase", "&Paper Size:", 0)); - label_2->setText(QApplication::translate("PreviewDialogBase", "&Orientation:", 0)); + 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)); QTreeWidgetItem *___qtreewidgetitem = pageList->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/previewwidget.ui.h b/tests/auto/tools/uic/baseline/previewwidget.ui.h index a641ea7054..cc7240d950 100644 --- a/tests/auto/tools/uic/baseline/previewwidget.ui.h +++ b/tests/auto/tools/uic/baseline/previewwidget.ui.h @@ -242,20 +242,20 @@ public: void retranslateUi(QWidget *qdesigner_internal__PreviewWidget) { - qdesigner_internal__PreviewWidget->setWindowTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "Preview Window", 0)); - LineEdit1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "LineEdit", 0)); + qdesigner_internal__PreviewWidget->setWindowTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "Preview Window", Q_NULLPTR)); + LineEdit1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "LineEdit", Q_NULLPTR)); ComboBox1->clear(); ComboBox1->insertItems(0, QStringList() - << QApplication::translate("qdesigner_internal::PreviewWidget", "ComboBox", 0) + << QApplication::translate("qdesigner_internal::PreviewWidget", "ComboBox", Q_NULLPTR) ); - PushButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "PushButton", 0)); - ButtonGroup2->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup2", 0)); - CheckBox1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox1", 0)); - CheckBox2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox2", 0)); - ButtonGroup1->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup", 0)); - RadioButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton1", 0)); - RadioButton2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton2", 0)); - RadioButton3->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton3", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/proxy.ui.h b/tests/auto/tools/uic/baseline/proxy.ui.h index d311478853..79a33251b7 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", 0)); - iconLabel->setText(QApplication::translate("ProxyDialog", "ICON", 0)); - introLabel->setText(QApplication::translate("ProxyDialog", "Connect to proxy", 0)); - usernameLabel->setText(QApplication::translate("ProxyDialog", "Username:", 0)); - passwordLabel->setText(QApplication::translate("ProxyDialog", "Password:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h index eb38bd06c3..79e8fdf66b 100644 --- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h @@ -278,26 +278,26 @@ public: void retranslateUi(QDialog *QFileDialog) { - lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", 0)); + lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - backButton->setToolTip(QApplication::translate("QFileDialog", "Back", 0)); + backButton->setToolTip(QApplication::translate("QFileDialog", "Back", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", 0)); + forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", 0)); + toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", 0)); + newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", 0)); + listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", 0)); + detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", 0)); + fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", Q_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 48f840f2f8..0c6fc92ea2 100644 --- a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h +++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h @@ -269,41 +269,41 @@ public: void retranslateUi(QWidget *QPageSetupWidget) { - QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", 0)); - groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", 0)); - pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", 0)); - widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", 0)); - heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", 0)); - paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", 0)); - groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", 0)); - portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", 0)); - landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", 0)); - reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", 0)); - reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", 0)); - groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", 0)); + 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)); #ifndef QT_NO_TOOLTIP - topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", 0)); + topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", 0)); + topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", 0)); + leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", 0)); + leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", 0)); + rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", 0)); + rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", 0)); + bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", 0)); + bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY } // retranslateUi diff --git a/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h index 7251f05300..dcd6ca6efd 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", 0)); - tabs->setTabText(tabs->indexOf(tabPage), QApplication::translate("QPrintPropertiesWidget", "Page", 0)); - tabs->setTabText(tabs->indexOf(cupsPropertiesPage), QApplication::translate("QPrintPropertiesWidget", "Advanced", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h index f3816965dd..a11709c014 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", 0)); - gbPrintRange->setTitle(QApplication::translate("QPrintSettingsOutput", "Print range", 0)); - printAll->setText(QApplication::translate("QPrintSettingsOutput", "Print all", 0)); - printRange->setText(QApplication::translate("QPrintSettingsOutput", "Pages from", 0)); - label_3->setText(QApplication::translate("QPrintSettingsOutput", "to", 0)); - printSelection->setText(QApplication::translate("QPrintSettingsOutput", "Selection", 0)); - groupBox->setTitle(QApplication::translate("QPrintSettingsOutput", "Output Settings", 0)); - label->setText(QApplication::translate("QPrintSettingsOutput", "Copies:", 0)); - collate->setText(QApplication::translate("QPrintSettingsOutput", "Collate", 0)); - reverse->setText(QApplication::translate("QPrintSettingsOutput", "Reverse", 0)); - tabs->setTabText(tabs->indexOf(copiesTab), QApplication::translate("QPrintSettingsOutput", "Copies", 0)); - colorMode->setTitle(QApplication::translate("QPrintSettingsOutput", "Color Mode", 0)); - color->setText(QApplication::translate("QPrintSettingsOutput", "Color", 0)); - grayscale->setText(QApplication::translate("QPrintSettingsOutput", "Grayscale", 0)); - duplex->setTitle(QApplication::translate("QPrintSettingsOutput", "Duplex Printing", 0)); - noDuplex->setText(QApplication::translate("QPrintSettingsOutput", "None", 0)); - duplexLong->setText(QApplication::translate("QPrintSettingsOutput", "Long side", 0)); - duplexShort->setText(QApplication::translate("QPrintSettingsOutput", "Short side", 0)); - tabs->setTabText(tabs->indexOf(optionsTab), QApplication::translate("QPrintSettingsOutput", "Options", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qprintwidget.ui.h b/tests/auto/tools/uic/baseline/qprintwidget.ui.h index 0358176321..7a81f3daf5 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", 0)); - printerGroup->setTitle(QApplication::translate("QPrintWidget", "Printer", 0)); - label->setText(QApplication::translate("QPrintWidget", "&Name:", 0)); - properties->setText(QApplication::translate("QPrintWidget", "P&roperties", 0)); - label_2->setText(QApplication::translate("QPrintWidget", "Location:", 0)); - preview->setText(QApplication::translate("QPrintWidget", "Preview", 0)); - label_3->setText(QApplication::translate("QPrintWidget", "Type:", 0)); - lOutput->setText(QApplication::translate("QPrintWidget", "Output &file:", 0)); - fileBrowser->setText(QApplication::translate("QPrintWidget", "...", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h index 31edb426fe..bffb9a1b63 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...", 0)); - connGroupBox->setTitle(QApplication::translate("QSqlConnectionDialogUi", "Connection settings", 0)); - textLabel4->setText(QApplication::translate("QSqlConnectionDialogUi", "&Username:", 0)); - textLabel2->setText(QApplication::translate("QSqlConnectionDialogUi", "D&river", 0)); - portSpinBox->setSpecialValueText(QApplication::translate("QSqlConnectionDialogUi", "Default", 0)); - textLabel3->setText(QApplication::translate("QSqlConnectionDialogUi", "Database Name:", 0)); - textLabel5->setText(QApplication::translate("QSqlConnectionDialogUi", "&Hostname:", 0)); - textLabel5_2->setText(QApplication::translate("QSqlConnectionDialogUi", "P&ort:", 0)); - textLabel4_2->setText(QApplication::translate("QSqlConnectionDialogUi", "&Password:", 0)); - dbCheckBox->setText(QApplication::translate("QSqlConnectionDialogUi", "Us&e predefined in-memory database", 0)); - okButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&OK", 0)); - cancelButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&Cancel", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h index e1503c7009..53dd11636f 100644 --- a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h @@ -97,7 +97,7 @@ public: void retranslateUi(QDialog *QtGradientDialog) { - QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", 0)); + QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h index 5a148d1e31..702879e479 100644 --- a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h @@ -591,119 +591,119 @@ public: void retranslateUi(QWidget *QtGradientEditor) { - QtGradientEditor->setWindowTitle(QApplication::translate("QtGradientEditor", "Form", 0)); + QtGradientEditor->setWindowTitle(QApplication::translate("QtGradientEditor", "Form", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - gradientWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Editor", 0)); + gradientWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Editor", Q_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.", 0)); + 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)); #endif // QT_NO_WHATSTHIS - label1->setText(QApplication::translate("QtGradientEditor", "1", 0)); - label2->setText(QApplication::translate("QtGradientEditor", "2", 0)); - label3->setText(QApplication::translate("QtGradientEditor", "3", 0)); - label4->setText(QApplication::translate("QtGradientEditor", "4", 0)); - label5->setText(QApplication::translate("QtGradientEditor", "5", 0)); + 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)); #ifndef QT_NO_TOOLTIP - gradientStopsWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Stops Editor", 0)); + gradientStopsWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Stops Editor", Q_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.", 0)); + 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)); #endif // QT_NO_WHATSTHIS - zoomLabel->setText(QApplication::translate("QtGradientEditor", "Zoom", 0)); + zoomLabel->setText(QApplication::translate("QtGradientEditor", "Zoom", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - zoomAllButton->setToolTip(QApplication::translate("QtGradientEditor", "Reset Zoom", 0)); + zoomAllButton->setToolTip(QApplication::translate("QtGradientEditor", "Reset Zoom", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - zoomAllButton->setText(QApplication::translate("QtGradientEditor", "Reset Zoom", 0)); - positionLabel->setText(QApplication::translate("QtGradientEditor", "Position", 0)); + zoomAllButton->setText(QApplication::translate("QtGradientEditor", "Reset Zoom", Q_NULLPTR)); + positionLabel->setText(QApplication::translate("QtGradientEditor", "Position", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - hLabel->setToolTip(QApplication::translate("QtGradientEditor", "Hue", 0)); + hLabel->setToolTip(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - hLabel->setText(QApplication::translate("QtGradientEditor", "H", 0)); + hLabel->setText(QApplication::translate("QtGradientEditor", "H", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - hueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Hue", 0)); + hueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - hueLabel->setText(QApplication::translate("QtGradientEditor", "Hue", 0)); + hueLabel->setText(QApplication::translate("QtGradientEditor", "Hue", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - sLabel->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", 0)); + sLabel->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - sLabel->setText(QApplication::translate("QtGradientEditor", "S", 0)); + sLabel->setText(QApplication::translate("QtGradientEditor", "S", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - saturationColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", 0)); + saturationColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - saturationLabel->setText(QApplication::translate("QtGradientEditor", "Sat", 0)); + saturationLabel->setText(QApplication::translate("QtGradientEditor", "Sat", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - vLabel->setToolTip(QApplication::translate("QtGradientEditor", "Value", 0)); + vLabel->setToolTip(QApplication::translate("QtGradientEditor", "Value", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - vLabel->setText(QApplication::translate("QtGradientEditor", "V", 0)); + vLabel->setText(QApplication::translate("QtGradientEditor", "V", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - valueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Value", 0)); + valueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Value", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - valueLabel->setText(QApplication::translate("QtGradientEditor", "Val", 0)); + valueLabel->setText(QApplication::translate("QtGradientEditor", "Val", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - aLabel->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", 0)); + aLabel->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - aLabel->setText(QApplication::translate("QtGradientEditor", "A", 0)); + aLabel->setText(QApplication::translate("QtGradientEditor", "A", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - alphaColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", 0)); + alphaColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - alphaLabel->setText(QApplication::translate("QtGradientEditor", "Alpha", 0)); + alphaLabel->setText(QApplication::translate("QtGradientEditor", "Alpha", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - typeComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Type", 0)); + typeComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Type", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - spreadComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Spread", 0)); + spreadComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Spread", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - colorLabel->setText(QApplication::translate("QtGradientEditor", "Color", 0)); + colorLabel->setText(QApplication::translate("QtGradientEditor", "Color", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - colorButton->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's color", 0)); + colorButton->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's color", Q_NULLPTR)); #endif // QT_NO_TOOLTIP colorButton->setText(QString()); #ifndef QT_NO_TOOLTIP - hsvRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show HSV specification", 0)); + hsvRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show HSV specification", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - hsvRadioButton->setText(QApplication::translate("QtGradientEditor", "HSV", 0)); + hsvRadioButton->setText(QApplication::translate("QtGradientEditor", "HSV", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - rgbRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show RGB specification", 0)); + rgbRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show RGB specification", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - rgbRadioButton->setText(QApplication::translate("QtGradientEditor", "RGB", 0)); + rgbRadioButton->setText(QApplication::translate("QtGradientEditor", "RGB", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - positionSpinBox->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's position", 0)); + positionSpinBox->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's position", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - zoomSpinBox->setSuffix(QApplication::translate("QtGradientEditor", "%", 0)); + zoomSpinBox->setSuffix(QApplication::translate("QtGradientEditor", "%", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - zoomInButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom In", 0)); + zoomInButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom In", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - zoomOutButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom Out", 0)); + zoomOutButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom Out", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailsButton->setToolTip(QApplication::translate("QtGradientEditor", "Toggle details extension", 0)); + detailsButton->setToolTip(QApplication::translate("QtGradientEditor", "Toggle details extension", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - detailsButton->setText(QApplication::translate("QtGradientEditor", ">", 0)); + detailsButton->setText(QApplication::translate("QtGradientEditor", ">", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - linearButton->setToolTip(QApplication::translate("QtGradientEditor", "Linear Type", 0)); + linearButton->setToolTip(QApplication::translate("QtGradientEditor", "Linear Type", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - linearButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + linearButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - radialButton->setToolTip(QApplication::translate("QtGradientEditor", "Radial Type", 0)); + radialButton->setToolTip(QApplication::translate("QtGradientEditor", "Radial Type", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - radialButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + radialButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - conicalButton->setToolTip(QApplication::translate("QtGradientEditor", "Conical Type", 0)); + conicalButton->setToolTip(QApplication::translate("QtGradientEditor", "Conical Type", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - conicalButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + conicalButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - padButton->setToolTip(QApplication::translate("QtGradientEditor", "Pad Spread", 0)); + padButton->setToolTip(QApplication::translate("QtGradientEditor", "Pad Spread", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - padButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + padButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - repeatButton->setToolTip(QApplication::translate("QtGradientEditor", "Repeat Spread", 0)); + repeatButton->setToolTip(QApplication::translate("QtGradientEditor", "Repeat Spread", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - repeatButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + repeatButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", 0)); + reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - reflectButton->setText(QApplication::translate("QtGradientEditor", "...", 0)); + reflectButton->setText(QApplication::translate("QtGradientEditor", "...", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientview.ui.h b/tests/auto/tools/uic/baseline/qtgradientview.ui.h index 5847730235..14cb1da6b2 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", 0)); - newButton->setText(QApplication::translate("QtGradientView", "New...", 0)); - editButton->setText(QApplication::translate("QtGradientView", "Edit...", 0)); - renameButton->setText(QApplication::translate("QtGradientView", "Rename", 0)); - removeButton->setText(QApplication::translate("QtGradientView", "Remove", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h index e2494f9107..917c0f07f9 100644 --- a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h @@ -97,7 +97,7 @@ public: void retranslateUi(QDialog *QtGradientViewDialog) { - QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", 0)); + QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h index 6d5f25872b..50c844cf35 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", 0)); + QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", 0)); + newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", 0)); + newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", 0)); + removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", 0)); - importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", 0)); + removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR)); + importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", 0)); + newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", 0)); - addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", 0)); + newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR)); + addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", 0)); + removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", 0)); + removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h index 9439b6b1d3..6694cf4ccd 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", 0)); + QtToolBarDialog->setWindowTitle(QApplication::translate("QtToolBarDialog", "Customize Toolbars", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = actionTree->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("QtToolBarDialog", "1", 0)); - label->setText(QApplication::translate("QtToolBarDialog", "Actions", 0)); - label_2->setText(QApplication::translate("QtToolBarDialog", "Toolbars", 0)); + ___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)); #ifndef QT_NO_TOOLTIP - newButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add new toolbar", 0)); + newButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add new toolbar", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newButton->setText(QApplication::translate("QtToolBarDialog", "New", 0)); + newButton->setText(QApplication::translate("QtToolBarDialog", "New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - removeButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove selected toolbar", 0)); + removeButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove selected toolbar", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeButton->setText(QApplication::translate("QtToolBarDialog", "Remove", 0)); + removeButton->setText(QApplication::translate("QtToolBarDialog", "Remove", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - renameButton->setToolTip(QApplication::translate("QtToolBarDialog", "Rename toolbar", 0)); + renameButton->setToolTip(QApplication::translate("QtToolBarDialog", "Rename toolbar", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - renameButton->setText(QApplication::translate("QtToolBarDialog", "Rename", 0)); + renameButton->setText(QApplication::translate("QtToolBarDialog", "Rename", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action up", 0)); + upButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("QtToolBarDialog", "Up", 0)); + upButton->setText(QApplication::translate("QtToolBarDialog", "Up", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - leftButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove action from toolbar", 0)); + leftButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove action from toolbar", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - leftButton->setText(QApplication::translate("QtToolBarDialog", "<-", 0)); + leftButton->setText(QApplication::translate("QtToolBarDialog", "<-", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - rightButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add action to toolbar", 0)); + rightButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add action to toolbar", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - rightButton->setText(QApplication::translate("QtToolBarDialog", "->", 0)); + rightButton->setText(QApplication::translate("QtToolBarDialog", "->", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action down", 0)); + downButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("QtToolBarDialog", "Down", 0)); - label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", 0)); + downButton->setText(QApplication::translate("QtToolBarDialog", "Down", Q_NULLPTR)); + label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/querywidget.ui.h b/tests/auto/tools/uic/baseline/querywidget.ui.h index 1dcf7befdd..531df0d614 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", 0)); - inputGroupBox->setTitle(QApplication::translate("QueryWidget", "Input Document", 0)); - queryGroupBox->setTitle(QApplication::translate("QueryWidget", "Select your query:", 0)); - outputGroupBox->setTitle(QApplication::translate("QueryWidget", "Output Document", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h index b25f940450..00af983ed7 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", 0)); - actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", 0)); - label->setText(QApplication::translate("RemoteControlClass", "Start URL:", 0)); - launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", 0)); - actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", 0)); - label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", 0)); + 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)); indexButton->setText(QString()); - label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", 0)); + label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", Q_NULLPTR)); identifierButton->setText(QString()); - label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", 0)); + label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", Q_NULLPTR)); urlButton->setText(QString()); - syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", 0)); - contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", 0)); - indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", 0)); - bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", 0)); - menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h index 7403088466..f4cd14d0c7 100644 --- a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h +++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h @@ -139,10 +139,10 @@ public: void retranslateUi(QDialog *SaveFormAsTemplate) { - SaveFormAsTemplate->setWindowTitle(QApplication::translate("SaveFormAsTemplate", "Save Form As Template", 0)); - label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", 0)); + SaveFormAsTemplate->setWindowTitle(QApplication::translate("SaveFormAsTemplate", "Save Form As Template", Q_NULLPTR)); + label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", Q_NULLPTR)); templateNameEdit->setText(QString()); - label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", 0)); + label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h index aa03609e98..7342810462 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", 0)); - label->setText(QApplication::translate("Dialog", "Audio device:", 0)); - label_6->setText(QApplication::translate("Dialog", "Audio effect:", 0)); - crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", 0)); - label_3->setText(QApplication::translate("Dialog", "-10 Sec", 0)); - label_5->setText(QApplication::translate("Dialog", "0", 0)); - label_4->setText(QApplication::translate("Dialog", "10 Sec", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h index c0a72b3c91..5c1483c651 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", 0)); - slotGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Slots", 0)); + SignalSlotDialogClass->setWindowTitle(QApplication::translate("SignalSlotDialogClass", "Signals and slots", Q_NULLPTR)); + slotGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Slots", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - addSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", 0)); + addSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - addSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0)); + addSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - removeSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", 0)); + removeSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0)); - signalGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Signals", 0)); + removeSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); + signalGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Signals", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - addSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", 0)); + addSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - addSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0)); + addSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", 0)); + removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0)); + removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h index f2071d8780..7c8676eec7 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", 0)); - hostNameLabel->setText(QApplication::translate("Form", "Host name:", 0)); - hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", 0)); - portLabel->setText(QApplication::translate("Form", "Port:", 0)); - connectButton->setText(QApplication::translate("Form", "Connect to host", 0)); - sessionBox->setTitle(QApplication::translate("Form", "Active session", 0)); - cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", 0)); - cipherLabel->setText(QApplication::translate("Form", "", 0)); + 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", "", Q_NULLPTR)); sessionOutput->setHtml(QApplication::translate("Form", "\n" -"

", 0)); - sessionInputLabel->setText(QApplication::translate("Form", "Input:", 0)); - sendButton->setText(QApplication::translate("Form", "&Send", 0)); +"

", Q_NULLPTR)); + sessionInputLabel->setText(QApplication::translate("Form", "Input:", Q_NULLPTR)); + sendButton->setText(QApplication::translate("Form", "&Send", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/sslerrors.ui.h b/tests/auto/tools/uic/baseline/sslerrors.ui.h index c52c71f3aa..0149eee45a 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", 0)); + SslErrors->setWindowTitle(QApplication::translate("SslErrors", "Unable To Validate The Connection", Q_NULLPTR)); label->setText(QApplication::translate("SslErrors", "\n" -"

Warning: 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 Ignore to continue, or Cancel to abort the connection.

", 0)); - certificateChainButton->setText(QApplication::translate("SslErrors", "View Certificate Chain", 0)); - pushButton->setText(QApplication::translate("SslErrors", "Ignore", 0)); - pushButton_2->setText(QApplication::translate("SslErrors", "Cancel", 0)); +"

Warning: 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 Ignore to continue, or Cancel to abort the connection.

", 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/statistics.ui.h b/tests/auto/tools/uic/baseline/statistics.ui.h index 9758b6721a..261759c487 100644 --- a/tests/auto/tools/uic/baseline/statistics.ui.h +++ b/tests/auto/tools/uic/baseline/statistics.ui.h @@ -187,19 +187,19 @@ public: void retranslateUi(QDialog *Statistics) { - Statistics->setWindowTitle(QApplication::translate("Statistics", "Statistics", 0)); - closeBtn->setText(QApplication::translate("Statistics", "&Close", 0)); - textLabel4->setText(QApplication::translate("Statistics", "Translation", 0)); - textLabel5->setText(QApplication::translate("Statistics", "Source", 0)); - untrWords->setText(QApplication::translate("Statistics", "0", 0)); - trWords->setText(QApplication::translate("Statistics", "0", 0)); - textLabel1->setText(QApplication::translate("Statistics", "Words:", 0)); - trChars->setText(QApplication::translate("Statistics", "0", 0)); - untrChars->setText(QApplication::translate("Statistics", "0", 0)); - textLabel3->setText(QApplication::translate("Statistics", "Characters:", 0)); - textLabel6->setText(QApplication::translate("Statistics", "Characters (with spaces):", 0)); - trCharsSpc->setText(QApplication::translate("Statistics", "0", 0)); - untrCharsSpc->setText(QApplication::translate("Statistics", "0", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h index a1652cd0d0..f599b0fdef 100644 --- a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h @@ -222,25 +222,25 @@ public: void retranslateUi(QDialog *qdesigner_internal__Dialog) { - qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", 0)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", 0)); + qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", 0)); + newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", 0)); + newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", 0)); + deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", 0)); - label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", 0)); + deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", Q_NULLPTR)); + label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", 0)); + upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", 0)); + upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", 0)); + downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", 0)); + downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h index 35b45f7e94..94ffa45509 100644 --- a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h @@ -130,16 +130,16 @@ public: void retranslateUi(QWidget *StyleSheetEditor) { - StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", 0)); + StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", Q_NULLPTR)); styleSheetCombo->clear(); styleSheetCombo->insertItems(0, QStringList() - << QApplication::translate("StyleSheetEditor", "Default", 0) - << QApplication::translate("StyleSheetEditor", "Coffee", 0) - << QApplication::translate("StyleSheetEditor", "Pagefold", 0) + << QApplication::translate("StyleSheetEditor", "Default", Q_NULLPTR) + << QApplication::translate("StyleSheetEditor", "Coffee", Q_NULLPTR) + << QApplication::translate("StyleSheetEditor", "Pagefold", Q_NULLPTR) ); - label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", 0)); - applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", 0)); - label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h index 79c70c0440..571138771d 100644 --- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h +++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h @@ -188,14 +188,14 @@ public: void retranslateUi(QWidget *TabbedBrowser) { - TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", 0)); - tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", 0)); + TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", Q_NULLPTR)); + tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", Q_NULLPTR)); toolClose->setText(QString()); - toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", 0)); - toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0)); - checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0)); - checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0)); - labelWrapped->setText(QApplication::translate("TabbedBrowser", " Search wrapped", 0)); + 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", " Search wrapped", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h index 6587b76613..ae54db7db3 100644 --- a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h @@ -318,54 +318,54 @@ public: void retranslateUi(QDialog *qdesigner_internal__TableWidgetEditor) { - qdesigner_internal__TableWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Edit Table Widget", 0)); - itemsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", 0)); + 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)); #ifndef QT_NO_TOOLTIP - tableWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", 0)); + tableWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - label_3->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0)); - columnsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Columns", 0)); + label_3->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", Q_NULLPTR)); + columnsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Columns", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - columnsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Columns", 0)); + columnsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Columns", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Column", 0)); + newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Column", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", 0)); + newColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Column", 0)); + deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Column", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", 0)); + deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Up", 0)); + moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", 0)); + moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Down", 0)); + moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", 0)); - label->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0)); - rowsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Rows", 0)); + 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)); #ifndef QT_NO_TOOLTIP - rowsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Rows", 0)); + rowsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Rows", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Row", 0)); + newRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Row", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", 0)); + newRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Row", 0)); + deleteRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Row", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", 0)); + deleteRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveRowUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Up", 0)); + moveRowUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveRowUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", 0)); + moveRowUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveRowDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Down", 0)); + moveRowDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0)); + moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", Q_NULLPTR)); + label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h index 0f945fab35..f3ec6d6fc9 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", 0)); - startButton->setText(QApplication::translate("TetrixWindow", "&Start", 0)); - linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", 0)); - pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", 0)); - levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", 0)); - nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", 0)); - scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", 0)); + 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)); nextPieceLabel->setText(QString()); - quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", 0)); + quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/textfinder.ui.h b/tests/auto/tools/uic/baseline/textfinder.ui.h index 148bf11dbc..159cb54c0a 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", 0)); - searchLabel->setText(QApplication::translate("Form", "&Keyword:", 0)); - findButton->setText(QApplication::translate("Form", "&Find", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h index 3935a7a87b..5580b437da 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", 0)); - label->setText(QApplication::translate("TopicChooser", "&Topics", 0)); - buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", 0)); - buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h index c494ca77c3..e79649cb88 100644 --- a/tests/auto/tools/uic/baseline/translatedialog.ui.h +++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h @@ -213,34 +213,34 @@ public: void retranslateUi(QDialog *TranslateDialog) { - TranslateDialog->setWindowTitle(QApplication::translate("TranslateDialog", "Qt Linguist", 0)); + TranslateDialog->setWindowTitle(QApplication::translate("TranslateDialog", "Qt Linguist", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - TranslateDialog->setWhatsThis(QApplication::translate("TranslateDialog", "This window allows you to search for some text in the translation source file.", 0)); + TranslateDialog->setWhatsThis(QApplication::translate("TranslateDialog", "This window allows you to search for some text in the translation source file.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS #ifndef QT_NO_WHATSTHIS - ledTranslateTo->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", 0)); + ledTranslateTo->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - findWhat->setText(QApplication::translate("TranslateDialog", "Find &source text:", 0)); - translateTo->setText(QApplication::translate("TranslateDialog", "&Translate to:", 0)); + findWhat->setText(QApplication::translate("TranslateDialog", "Find &source text:", Q_NULLPTR)); + translateTo->setText(QApplication::translate("TranslateDialog", "&Translate to:", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - ledFindWhat->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", 0)); + ledFindWhat->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - groupBox->setTitle(QApplication::translate("TranslateDialog", "Search options", 0)); + groupBox->setTitle(QApplication::translate("TranslateDialog", "Search options", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - ckMatchCase->setWhatsThis(QApplication::translate("TranslateDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", 0)); + ckMatchCase->setWhatsThis(QApplication::translate("TranslateDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - ckMatchCase->setText(QApplication::translate("TranslateDialog", "Match &case", 0)); - ckMarkFinished->setText(QApplication::translate("TranslateDialog", "Mark new translation as &finished", 0)); + ckMatchCase->setText(QApplication::translate("TranslateDialog", "Match &case", Q_NULLPTR)); + ckMarkFinished->setText(QApplication::translate("TranslateDialog", "Mark new translation as &finished", Q_NULLPTR)); #ifndef QT_NO_WHATSTHIS - findNxt->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to find the next occurrence of the text you typed in.", 0)); + findNxt->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to find the next occurrence of the text you typed in.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - findNxt->setText(QApplication::translate("TranslateDialog", "Find Next", 0)); - translate->setText(QApplication::translate("TranslateDialog", "Translate", 0)); - translateAll->setText(QApplication::translate("TranslateDialog", "Translate All", 0)); + 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)); #ifndef QT_NO_WHATSTHIS - cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", 0)); + cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", Q_NULLPTR)); #endif // QT_NO_WHATSTHIS - cancel->setText(QApplication::translate("TranslateDialog", "Cancel", 0)); + cancel->setText(QApplication::translate("TranslateDialog", "Cancel", Q_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 597728e207..08c063cf6f 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", 0)); + Dialog->setWindowTitle(i18n("Dialog", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h index e67cba5289..628c42d42e 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", 0)); - groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", 0)); - label->setText(QApplication::translate("TranslationSettings", "Language", 0)); - lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", 0)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h index 9c18506f25..f34dcfd98e 100644 --- a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h @@ -283,63 +283,63 @@ public: void retranslateUi(QDialog *qdesigner_internal__TreeWidgetEditor) { - qdesigner_internal__TreeWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Edit Tree Widget", 0)); - itemsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", 0)); + 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)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("qdesigner_internal::TreeWidgetEditor", "1", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("qdesigner_internal::TreeWidgetEditor", "1", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - treeWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", 0)); + treeWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Item", 0)); + newItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Item", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&New", 0)); + newItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - newSubItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Subitem", 0)); + newSubItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Subitem", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newSubItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New &Subitem", 0)); + newSubItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New &Subitem", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Item", 0)); + deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Item", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&Delete", 0)); + deleteItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&Delete", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemLeftButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Left (before Parent Item)", 0)); + moveItemLeftButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Left (before Parent Item)", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemLeftButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "L", 0)); + moveItemLeftButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "L", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemRightButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Right (as a First Subitem of the Next Sibling Item)", 0)); + moveItemRightButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Right (as a First Subitem of the Next Sibling Item)", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemRightButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "R", 0)); + moveItemRightButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "R", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Up", 0)); + moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", 0)); + moveItemUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Down", 0)); + moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveItemDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", 0)); - columnsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Columns", 0)); + 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)); #ifndef QT_NO_TOOLTIP - listWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Columns", 0)); + listWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Columns", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Column", 0)); + newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Column", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - newColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New", 0)); + newColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Column", 0)); + deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Column", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete", 0)); + deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Up", 0)); + moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Up", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", 0)); + moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Down", 0)); + moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Down", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", 0)); - label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", 0)); + moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", Q_NULLPTR)); + label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h index 82b7be851c..8caf5b75db 100644 --- a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h +++ b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h @@ -169,19 +169,19 @@ public: void retranslateUi(QMainWindow *TrPreviewToolClass) { - TrPreviewToolClass->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Qt Translation Preview Tool", 0)); - actionOpenForm->setText(QApplication::translate("TrPreviewToolClass", "&Open Form...", 0)); - actionLoadTranslation->setText(QApplication::translate("TrPreviewToolClass", "&Load Translation...", 0)); - actionReloadTranslations->setText(QApplication::translate("TrPreviewToolClass", "&Reload Translations", 0)); - actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", 0)); - actionClose->setText(QApplication::translate("TrPreviewToolClass", "&Close", 0)); - actionAbout->setText(QApplication::translate("TrPreviewToolClass", "About", 0)); - actionAbout_Qt->setText(QApplication::translate("TrPreviewToolClass", "About Qt", 0)); - menuView->setTitle(QApplication::translate("TrPreviewToolClass", "&View", 0)); - menuViewViews->setTitle(QApplication::translate("TrPreviewToolClass", "&Views", 0)); - menuHelp->setTitle(QApplication::translate("TrPreviewToolClass", "&Help", 0)); - menuFile->setTitle(QApplication::translate("TrPreviewToolClass", "&File", 0)); - dwForms->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Forms", 0)); + 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)); + actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", Q_NULLPTR)); + 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)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h index 3770c45dcb..e8548f1454 100644 --- a/tests/auto/tools/uic/baseline/validators.ui.h +++ b/tests/auto/tools/uic/baseline/validators.ui.h @@ -376,24 +376,24 @@ public: void retranslateUi(QWidget *ValidatorsForm) { - ValidatorsForm->setWindowTitle(QApplication::translate("ValidatorsForm", "Form", 0)); - groupBox->setTitle(QApplication::translate("ValidatorsForm", "QIntValidator", 0)); - label->setText(QApplication::translate("ValidatorsForm", "Min:", 0)); - label_2->setText(QApplication::translate("ValidatorsForm", "Max:", 0)); - label_7->setText(QApplication::translate("ValidatorsForm", "editingFinished()", 0)); - groupBox_2->setTitle(QApplication::translate("ValidatorsForm", "QDoubleValidator", 0)); - label_3->setText(QApplication::translate("ValidatorsForm", "Min:", 0)); - label_5->setText(QApplication::translate("ValidatorsForm", "Format:", 0)); + 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->clear(); doubleFormat->insertItems(0, QStringList() - << QApplication::translate("ValidatorsForm", "Standard", 0) - << QApplication::translate("ValidatorsForm", "Scientific", 0) + << QApplication::translate("ValidatorsForm", "Standard", Q_NULLPTR) + << QApplication::translate("ValidatorsForm", "Scientific", Q_NULLPTR) ); - label_4->setText(QApplication::translate("ValidatorsForm", "Max:", 0)); - label_6->setText(QApplication::translate("ValidatorsForm", "Decimals:", 0)); + label_4->setText(QApplication::translate("ValidatorsForm", "Max:", Q_NULLPTR)); + label_6->setText(QApplication::translate("ValidatorsForm", "Decimals:", Q_NULLPTR)); doubleLedWidget->setText(QString()); - label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", 0)); - pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", 0)); + label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", Q_NULLPTR)); + pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", Q_NULLPTR)); } // retranslateUi }; diff --git a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h index 705c7bb142..348a83a8da 100644 --- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h @@ -243,38 +243,38 @@ public: void retranslateUi(QDialog *WateringConfigDialog) { - WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", 0)); - label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", 0)); + WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", Q_NULLPTR)); + label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", Q_NULLPTR)); plantComboBox->clear(); plantComboBox->insertItems(0, QStringList() - << QApplication::translate("WateringConfigDialog", "Squash", 0) - << QApplication::translate("WateringConfigDialog", "Bean", 0) - << QApplication::translate("WateringConfigDialog", "Carrot", 0) - << QApplication::translate("WateringConfigDialog", "Strawberry", 0) - << QApplication::translate("WateringConfigDialog", "Raspberry", 0) - << QApplication::translate("WateringConfigDialog", "Blueberry", 0) + << QApplication::translate("WateringConfigDialog", "Squash", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Bean", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Carrot", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Strawberry", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Raspberry", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Blueberry", Q_NULLPTR) ); - label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", 0)); - temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", 0)); + label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", Q_NULLPTR)); + temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", Q_NULLPTR)); temperatureSpinBox->setSpecialValueText(QString()); - temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", 0)); - rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", 0)); + temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", Q_NULLPTR)); + rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", Q_NULLPTR)); rainSpinBox->setSpecialValueText(QString()); - rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", 0)); - label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", 0)); - label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", 0)); - amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", 0)); - label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", 0)); + 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->clear(); sourceComboBox->insertItems(0, QStringList() - << QApplication::translate("WateringConfigDialog", "Foundain", 0) - << QApplication::translate("WateringConfigDialog", "River", 0) - << QApplication::translate("WateringConfigDialog", "Lake", 0) - << QApplication::translate("WateringConfigDialog", "Public Water System", 0) + << QApplication::translate("WateringConfigDialog", "Foundain", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "River", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Lake", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Public Water System", Q_NULLPTR) ); - label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0)); + label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", Q_NULLPTR)); filterCheckBox->setText(QString()); - helpLabel->setText(QApplication::translate("WateringConfigDialog", "Show Details", 0)); + helpLabel->setText(QApplication::translate("WateringConfigDialog", "Show Details", Q_NULLPTR)); } // retranslateUi }; -- cgit v1.2.3 From 312d08b290d079f5d72d9afc14a47606ebdde240 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 26 Aug 2016 10:03:05 +0200 Subject: qstrncpy: don't call strncpy_s with invalid parameters According to https://msdn.microsoft.com/en-us/library/5dae5d43.aspx, strncpy_s' second argument must not be 0: > If strDest or strSource is NULL, *or numberOfElements is 0*, the > invalid parameter handler is invoked. Move the existing check for len > 0 up to protect the strncpy_s call, too. Change-Id: I70d339ea60d4b76f3038b2e4e4756f6590a9bd31 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/tools/qbytearray.cpp | 7 ++++--- tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 14 +++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 00d15fd518..8bae505d76 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -208,13 +208,14 @@ char *qstrncpy(char *dst, const char *src, uint len) { if (!src || !dst) return 0; + if (len > 0) { #if defined(_MSC_VER) && _MSC_VER >= 1400 - strncpy_s(dst, len, src, len-1); + strncpy_s(dst, len, src, len - 1); #else - strncpy(dst, src, len); + strncpy(dst, src, len); #endif - if (len > 0) dst[len-1] = '\0'; + } return dst; } diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index f942eab800..6d1c7481a9 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -794,9 +794,17 @@ void tst_QByteArray::qstrncpy() { QByteArray src(1024, 'a'), dst(1024, 'b'); - // singularities - QCOMPARE(::qstrncpy(0, 0,0), (char*)0); - QCOMPARE(::qstrncpy(dst.data(), 0, 0), (char*)0); + // dst == nullptr + QCOMPARE(::qstrncpy(0, src.data(), 0), (char*)0); + QCOMPARE(::qstrncpy(0, src.data(), 10), (char*)0); + + // src == nullptr + QCOMPARE(::qstrncpy(dst.data(), 0, 0), (char*)0); + QCOMPARE(::qstrncpy(dst.data(), 0, 10), (char*)0); + + // valid pointers, but len == 0 + QCOMPARE(::qstrncpy(dst.data(), src.data(), 0), dst.data()); + QCOMPARE(*dst.data(), 'b'); // must not have written to dst // normal copy QCOMPARE(::qstrncpy(dst.data(), src.data(), src.size()), dst.data()); -- cgit v1.2.3 From 2a6bea7a55308776a76cef838f307e272f23f406 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 1 Sep 2016 08:27:57 +0200 Subject: qcompilerdetection.h: retract Q_COMPILER_DEFAULT_MEMBERS for MSVC < 2015 Earlier versions of the compiler cannot default move special member functions, even though we also define Q_COMPILER_RVALUE_REFS for them. Fix by retracting the less-often-used of the two compiler feature defines. Q_COMPILER_DEFAULT_MEMBERS is not used outside QtBase in neither 5.6 nor 5.7 (5.8 is not released at this time, so wasn't considered). The same is true of the dependent macros Q_COMPILER_DEFAULT_DELETE_MEMBERS and Q_DECL_EQ_DEFAULT. In QtBase, the three uses are: 1. in QAtomic*, where the user also requires Q_COMPILER_CONSTEXPR, which is not defined for any MSVC at this time, 2. for QEnableSharedFromThis, which is a class template with an alternative {} implementa- tion of the default constructor, and uncon- ditional user-defined copy special member functions. 3. The test of the corresponding functionality in tst_compiler, which this commit amends. That means that neither of these two only uses of the macro in Qt libraries are affected by the change. The reason we do this change, then, is that in the future, we want to be able to more easily restore move special member functions for classes for which they are suppressed due to user-defined dtors or copy special member functions. Change-Id: I6f88cad66d6b87a758231f16355c3bddae697b86 Reviewed-by: Thiago Macieira --- src/corelib/global/qcompilerdetection.h | 4 +++- tests/auto/other/compiler/tst_compiler.cpp | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 2d9e0463b7..e324c043af 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -887,7 +887,8 @@ # endif /* VC 11 */ # if _MSC_VER >= 1800 /* C++11 features in VC12 = VC2013 */ -# define Q_COMPILER_DEFAULT_MEMBERS +/* Implemented, but can't be used on move special members */ +/* # define Q_COMPILER_DEFAULT_MEMBERS */ # define Q_COMPILER_DELETE_MEMBERS # define Q_COMPILER_DELEGATING_CONSTRUCTORS # define Q_COMPILER_EXPLICIT_CONVERSIONS @@ -905,6 +906,7 @@ # endif /* VC 12 SP 2 RC */ # if _MSC_VER >= 1900 /* C++11 features in VC14 = VC2015 */ +# define Q_COMPILER_DEFAULT_MEMBERS # define Q_COMPILER_ALIGNAS # define Q_COMPILER_ALIGNOF // Partial support, insufficient for Qt diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp index 8cd25bf164..941514b206 100644 --- a/tests/auto/other/compiler/tst_compiler.cpp +++ b/tests/auto/other/compiler/tst_compiler.cpp @@ -875,11 +875,14 @@ void tst_Compiler::cxx11_default_members() }; class DefaultMembersChild: public DefaultMembers { + DefaultMembersChild(const DefaultMembersChild &) : DefaultMembers() {} public: DefaultMembersChild():DefaultMembers() {}; + DefaultMembersChild(DefaultMembersChild &&) = default; }; DefaultMembersChild dm; - Q_UNUSED(dm); + DefaultMembersChild dm2 = std::move(dm); + Q_UNUSED(dm2); #endif } -- cgit v1.2.3 From c8cb188dd47d89da18f44a08557ca875baefcba7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 23 Aug 2016 16:40:56 +0200 Subject: Ensure the fontdatabase is initialized when requesting fallbacks Otherwise we will return an empty list of fallbacks if no QFontDatabase has been created yet. Task-number: QTBUG-55222 Change-Id: I50508162fad3206e0acf3cc6eb39aefac5c3e197 Reviewed-by: Peter Varga Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qfontdatabase.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 0621f2a524..f063541249 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -840,9 +840,13 @@ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFo return retList; } +static void initializeDb(); + static QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) { QFontDatabasePrivate *db = privateDb(); + if (!db->count) + initializeDb(); const FallbacksCacheKey cacheKey = { family, style, styleHint, script }; -- cgit v1.2.3 From 24bd7fd6518985f00e4102c2702ef50a8852b731 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 1 Sep 2016 14:00:58 +0200 Subject: Fix crash when rendering to grayscale8 images An entry was missing in one of the tables. This patch adds it back in and adds the enum comments used to keep track of whether they all are there and correctly set. Change-Id: Ic6a55a8f81f9c42a3174a2a75c80c3a354f173b7 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/gui/painting/qdrawhelper.cpp | 65 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index ac22c7fc00..ee3863ceb8 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -5384,17 +5384,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats blend_src_generic, // ARGB32 blend_transformed_argb, // ARGB32_Premultiplied blend_transformed_rgb565, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, + blend_src_generic, // ARGB8565_Premultiplied + blend_src_generic, // RGB666 + blend_src_generic, // ARGB6666_Premultiplied + blend_src_generic, // RGB555 + blend_src_generic, // ARGB8555_Premultiplied + blend_src_generic, // RGB888 + blend_src_generic, // RGB444 + blend_src_generic, // ARGB4444_Premultiplied + blend_src_generic, // RGBX8888 + blend_src_generic, // RGBA8888 + blend_src_generic, // RGBA8888_Premultiplied blend_src_generic_rgb64, blend_src_generic_rgb64, blend_src_generic_rgb64, @@ -5412,16 +5412,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats blend_src_generic, // ARGB32 blend_transformed_tiled_argb, // ARGB32_Premultiplied blend_transformed_tiled_rgb565, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, + blend_src_generic, // ARGB8565_Premultiplied + blend_src_generic, // RGB666 + blend_src_generic, // ARGB6666_Premultiplied + blend_src_generic, // RGB555 + blend_src_generic, // ARGB8555_Premultiplied + blend_src_generic, // RGB888 + blend_src_generic, // RGB444 + blend_src_generic, // ARGB4444_Premultiplied + blend_src_generic, // RGBX8888 + blend_src_generic, // RGBA8888 + blend_src_generic, // RGBA8888_Premultiplied blend_src_generic_rgb64, blend_src_generic_rgb64, blend_src_generic_rgb64, @@ -5439,17 +5440,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats blend_src_generic, // ARGB32 blend_src_generic, // ARGB32_Premultiplied blend_transformed_bilinear_rgb565, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, - blend_src_generic, + blend_src_generic, // ARGB8565_Premultiplied + blend_src_generic, // RGB666 + blend_src_generic, // ARGB6666_Premultiplied + blend_src_generic, // RGB555 + blend_src_generic, // ARGB8555_Premultiplied + blend_src_generic, // RGB888 + blend_src_generic, // RGB444 + blend_src_generic, // ARGB4444_Premultiplied + blend_src_generic, // RGBX8888 + blend_src_generic, // RGBA8888 + blend_src_generic, // RGBA8888_Premultiplied blend_src_generic_rgb64, blend_src_generic_rgb64, blend_src_generic_rgb64, -- cgit v1.2.3 From b94111116f09a6e48741d35cf7abea47af99ef26 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 29 Aug 2016 13:47:08 +0300 Subject: Style sheets: detect and apply font set on QHeaderView section Detect and apply style sheets font set when calculating QHeaderView section content size and drawing it. Change-Id: I542cd0d31bbe62f127c509f297eef0a576fec054 Task-number: QTBUG-55597 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/widgets/styles/qstylesheetstyle.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 568a4755e4..eae4658bc9 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -3753,6 +3753,13 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q ParentStyle::drawControl(ce, opt, p, w); return; } + if (subRule.hasFont) { + const QFont oldFont = p->font(); + p->setFont(subRule.font.resolve(p->font())); + baseStyle()->drawControl(ce, opt, p, w); + p->setFont(oldFont); + return; + } } break; case CE_HeaderSection: @@ -4866,13 +4873,14 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op case CT_HeaderSection: { if (const QStyleOptionHeader *hdr = qstyleoption_cast(opt)) { QRenderRule subRule = renderRule(w, opt, PseudoElement_HeaderViewSection); - if (subRule.hasGeometry() || subRule.hasBox() || !subRule.hasNativeBorder()) { + if (subRule.hasGeometry() || subRule.hasBox() || !subRule.hasNativeBorder() || subRule.hasFont) { sz = subRule.adjustSize(csz); if (!subRule.hasGeometry()) { QSize nativeContentsSize; bool nullIcon = hdr->icon.isNull(); int iconSize = nullIcon ? 0 : pixelMetric(QStyle::PM_SmallIconSize, hdr, w); - QSize txt = hdr->fontMetrics.size(0, hdr->text); + const QSize txt = subRule.hasFont ? QFontMetrics(subRule.font).size(0, hdr->text) + : hdr->fontMetrics.size(0, hdr->text); nativeContentsSize.setHeight(qMax(iconSize, txt.height())); nativeContentsSize.setWidth(iconSize + txt.width()); sz = sz.expandedTo(nativeContentsSize); -- cgit v1.2.3 From 676129d7ee57347798683d444823e7723776d8ec Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 31 Aug 2016 15:38:57 +0200 Subject: Run tst_QFiledialog::widgetlessNativeDialog() last widgetlessNativeDialog() is the only test function that creates a native file dialog instance. GTK+ versions prior 3.15.5 have a nasty bug (https://bugzilla.gnome.org/show_bug.cgi?id=725164) in GtkFileChooserWidget, which makes it leak its folder change callback, causing a crash "at some point later". Running the native test last is enough to avoid spinning the event loop after the test, and that way circumvent the crash (QTBUG-55276). The crash has been fixed in GTK+ 3.15.5, but the RHEL 7.2 CI has GTK+ 3.14.13 installed. Change-Id: I867755969a4458693bd12f848d052adf77a2086e Task-number: QTBUG-55276 Reviewed-by: Friedemann Kleint --- .../auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 57af76b0d5..e61c61ddfd 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -132,7 +132,6 @@ private slots: void saveButtonText(); void clearLineEdit(); void enableChooseButton(); - void widgetlessNativeDialog(); void selectedFilesWithoutWidgets(); void trailingDotsAndSpaces(); #ifdef Q_OS_UNIX @@ -144,6 +143,20 @@ private slots: void rejectModalDialogs(); void QTBUG49600_nativeIconProviderCrash(); + // NOTE: Please keep widgetlessNativeDialog() as the LAST test! + // + // widgetlessNativeDialog() is the only test function that creates + // a native file dialog instance. GTK+ versions prior 3.15.5 have + // a nasty bug (https://bugzilla.gnome.org/show_bug.cgi?id=725164) + // in GtkFileChooserWidget, which makes it leak its folder change + // callback, causing a crash "at some point later". Running the + // native test last is enough to avoid spinning the event loop after + // the test, and that way circumvent the crash. + // + // The crash has been fixed in GTK+ 3.15.5, but the RHEL 7.2 CI has + // GTK+ 3.14.13 installed (QTBUG-55276). + void widgetlessNativeDialog(); + private: void cleanupSettingsFile(); }; -- cgit v1.2.3