AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8

Browse Source
This commit is contained in:
Liang Qi 2016-09-06 06:56:27 +00:00 committed by The Qt Project
commit 23ef3b04eb
126 changed files with 1386 additions and 1181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt_common.prf
View File

@ -68,12 +68,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:!uikit {
# 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 {

4
src/corelib/global/qcompilerdetection.h
View File

@ -942,7 +942,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
@ -960,6 +961,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

7
src/corelib/tools/qbytearray.cpp
View File

@ -303,13 +303,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;
}

47
src/gui/image/qicon.cpp
View File

@ -47,6 +47,8 @@
#include "private/qiconloader_p.h"
#include "qpainter.h"
#include "qfileinfo.h"
#include <qmimedatabase.h>
#include <qmimetype.h>
#include "qpixmapcache.h"
#include "qvariant.h"
#include "qcache.h"
@ -839,8 +841,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);
@ -976,6 +981,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<QIconEnginePlugin*>(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 +1030,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<QIconEnginePlugin*>(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);

3
src/gui/kernel/qwindow.cpp
View File

@ -2195,6 +2195,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;

10
src/gui/kernel/qwindow_p.h
View File

@ -126,8 +126,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;
}

2
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -1283,11 +1283,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<const char *>(funcs->glGetString(GL_RENDERER));
const char *ver = reinterpret_cast<const char *>(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

65
src/gui/painting/qdrawhelper.cpp
View File

@ -5555,17 +5555,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,
@ -5583,16 +5583,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,
@ -5610,17 +5611,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,

4
src/gui/text/qfontdatabase.cpp
View File

@ -842,9 +842,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 };

5
src/platformsupport/cglconvenience/cglconvenience.mm
View File

@ -75,8 +75,11 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format)
QVector<NSOpenGLPixelFormatAttribute> 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 (format.profile() == QSurfaceFormat::CoreProfile
&& ((format.majorVersion() == 3 && format.minorVersion() >= 2)

10
src/plugins/platforms/cocoa/qcocoaglcontext.mm
View File

@ -312,8 +312,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];

13
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -750,10 +750,13 @@ void QWindowsNativeFileDialogBase::setDirectory(const QUrl &directory)
QString QWindowsNativeFileDialogBase::directory() const
{
QString result;
IShellItem *item = 0;
if (m_fileDialog && SUCCEEDED(m_fileDialog->GetFolder(&item)) && item)
return QWindowsNativeFileDialogBase::itemPath(item);
return QString();
if (m_fileDialog && SUCCEEDED(m_fileDialog->GetFolder(&item)) && item) {
result = QWindowsNativeFileDialogBase::itemPath(item);
item->Release();
}
return result;
}
void QWindowsNativeFileDialogBase::doExec(HWND owner)
@ -1216,8 +1219,10 @@ QList<QUrl> QWindowsNativeSaveFileDialog::selectedFiles() const
QList<QUrl> 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;
}

4
src/printsupport/kernel/qprintengine_win.cpp
View File

@ -924,14 +924,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();

6
src/printsupport/kernel/qprintengine_win_p.h
View File

@ -130,10 +130,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 */)
{
}

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

@ -2307,7 +2307,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()) {
if (m_option.idBased) {

12
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -3818,6 +3818,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:
@ -4931,13 +4938,14 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
case CT_HeaderSection: {
if (const QStyleOptionHeader *hdr = qstyleoption_cast<const QStyleOptionHeader *>(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);

53
src/widgets/widgets/qdockarealayout.cpp
View File

@ -2617,6 +2617,21 @@ void QDockAreaLayout::remove(const QList<int> &path)
docks[index].remove(path.mid(1));
}
void QDockAreaLayout::removePlaceHolder(const QString &name)
{
QList<int> index = indexOfPlaceHolder(name);
if (!index.isEmpty())
remove(index);
foreach (QDockWidgetGroupWindow *dwgw, mainWindow->findChildren<QDockWidgetGroupWindow *>(
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<QLayoutStruct> *_ver_struct_list,
@ -3043,15 +3058,27 @@ QRect QDockAreaLayout::constrainedRect(QRect rect, QWidget* widget)
bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget)
{
QList<int> index = indexOfPlaceHolder(dockWidget->objectName());
if (index.isEmpty())
return false;
QDockAreaLayoutItem *item = 0;
foreach (QDockWidgetGroupWindow *dwgw, mainWindow->findChildren<QDockWidgetGroupWindow *>(
QString(), Qt::FindDirectChildrenOnly)) {
QList<int> index = dwgw->layoutInfo()->indexOfPlaceHolder(dockWidget->objectName());
if (!index.isEmpty()) {
dockWidget->setParent(dwgw);
item = const_cast<QDockAreaLayoutItem *>(&dwgw->layoutInfo()->item(index));
break;
}
}
if (!item) {
QList<int> index = indexOfPlaceHolder(dockWidget->objectName());
if (index.isEmpty())
return false;
item = const_cast<QDockAreaLayoutItem *>(&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);
@ -3063,7 +3090,7 @@ bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget)
dockWidget->d_func()->setWindowState(true);
#endif
item.placeHolderItem = 0;
item->placeHolderItem = 0;
delete placeHolder;
return true;
@ -3099,9 +3126,7 @@ void QDockAreaLayout::addDockWidget(QInternal::DockPosition pos, QDockWidget *do
info = new_info;
}
QList<int> index = indexOfPlaceHolder(dockWidget->objectName());
if (!index.isEmpty())
remove(index);
removePlaceHolder(dockWidget->objectName());
}
void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
@ -3114,9 +3139,7 @@ void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
Q_ASSERT(info != 0);
info->tab(path.last(), new QDockWidgetItem(second));
QList<int> index = indexOfPlaceHolder(second->objectName());
if (!index.isEmpty())
remove(index);
removePlaceHolder(second->objectName());
}
void QDockAreaLayout::resizeDocks(const QList<QDockWidget *> &docks,
@ -3178,9 +3201,7 @@ void QDockAreaLayout::splitDockWidget(QDockWidget *after,
Q_ASSERT(info != 0);
info->split(path.last(), orientation, new QDockWidgetItem(dockWidget));
QList<int> index = indexOfPlaceHolder(dockWidget->objectName());
if (!index.isEmpty())
remove(index);
removePlaceHolder(dockWidget->objectName());
}
void QDockAreaLayout::apply(bool animate)

1
src/widgets/widgets/qdockarealayout_p.h
View File

@ -262,6 +262,7 @@ public:
QLayoutItem *plug(const QList<int> &path);
QLayoutItem *unplug(const QList<int> &path);
void remove(const QList<int> &path);
void removePlaceHolder(const QString &name);
void fitLayout();

70
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -221,11 +221,10 @@ public:
}
void setGeometry(const QRect&r) Q_DECL_OVERRIDE
{
static_cast<QDockWidgetGroupWindow *>(parent())->destroyOrHideIfEmpty();
QDockAreaLayoutInfo *li = layoutInfo();
if (li->isEmpty()) {
static_cast<QDockWidgetGroupWindow *>(parent())->destroyIfEmpty();
if (li->isEmpty())
return;
}
int fw = frameWidth();
li->reparentWidgets(parentWidget());
li->rect = r.adjusted(fw, fw, -fw, -fw);
@ -278,6 +277,10 @@ bool QDockWidgetGroupWindow::event(QEvent *e)
if (qobject_cast<QDockWidget *>(static_cast<QChildEvent*>(e)->child()))
adjustFlags();
break;
case QEvent::LayoutRequest:
// We might need to show the widget again
destroyOrHideIfEmpty();
break;
default:
break;
}
@ -331,34 +334,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()
void QDockWidgetGroupWindow::destroyOrHideIfEmpty()
{
if (layoutInfo()->isEmpty()) {
// Make sure to reparent the possibly floating or hidden QDockWidgets to the parent
foreach (QDockWidget *dw,
findChildren<QDockWidget *>(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<QMainWindow*>(parentWidget()));
Qt::DockWidgetArea area = ml->dockWidgetArea(this);
if (area == Qt::NoDockWidgetArea)
area = Qt::LeftDockWidgetArea;
static_cast<QMainWindow*>(parentWidget())->addDockWidget(area, dw);
}
if (!wasHidden)
dw->show();
}
foreach (QTabBar *tb, findChildren<QTabBar *>(QString(), Qt::FindDirectChildrenOnly))
tb->setParent(parentWidget());
deleteLater();
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<QDockWidget *>(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<QMainWindow *>(parentWidget()));
Qt::DockWidgetArea area = ml->dockWidgetArea(this);
if (area == Qt::NoDockWidgetArea)
area = Qt::LeftDockWidgetArea;
static_cast<QMainWindow *>(parentWidget())->addDockWidget(area, dw);
}
if (!wasHidden)
dw->show();
}
foreach (QTabBar *tb, findChildren<QTabBar *>(QString(), Qt::FindDirectChildrenOnly))
tb->setParent(parentWidget());
deleteLater();
}
/*! \internal
@ -2093,7 +2105,7 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
item.subinfo->reparentWidgets(parentWidget());
item.subinfo->setTabBarShape(parentInfo->tabBarShape);
}
dwgw->destroyIfEmpty();
dwgw->destroyOrHideIfEmpty();
}
if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget)) {

2
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -81,7 +81,7 @@ public:
: QWidget(parent, f) {}
QDockAreaLayoutInfo *layoutInfo() const;
QDockWidget *topDockWidget() const;
void destroyIfEmpty();
void destroyOrHideIfEmpty();
void adjustFlags();
protected:
bool event(QEvent *) Q_DECL_OVERRIDE;

14
tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
View File

@ -778,9 +778,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());

5
tests/auto/other/compiler/tst_compiler.cpp
View File

@ -870,11 +870,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
}

237
tests/auto/testlib/selftests/generate_expected_output.py
View File

@ -27,89 +27,184 @@
##
#############################################################################
#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', 'teamcity']
class Fail (Exception): pass
qtver = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).strip().decode('utf-8')
rootPath = os.getcwd()
class Cleaner (object):
"""Tool to clean up test output to make diff-ing runs useful.
isWindows = sys.platform == 'win32'
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.
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'( *)<Duration msecs="[\d\.]+"/>', r'\1<Duration msecs="0"/>'),
(r'( *)<QtBuild>[^<]+</QtBuild>', r'\1<QtBuild/>'), # Build element in xml, lightxml
(r'<property value="[^"]+" name="QtBuild"/>', r'<property value="" name="QtBuild"/>') # Build in xunitxml
]
Create one singleton instance; it'll do mildly expensive things
once and you can use its .clean() method to tidy up your test
output."""
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",
}
def __init__(self, here, command):
"""Set up the details we need for later cleaning.
# 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)
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)
def subdirs():
result = []
for path in os.listdir('.'):
if os.path.isdir('./' + path):
result.append(path)
return result
import re
@staticmethod
def __getPatterns(here, command,
patterns = (
# Timings:
(r'( *<Duration msecs=)"[\d\.]+"/>', 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'(<BenchmarkResult metric="(?:CPUTicks|WalltimeMilliseconds)".*\bvalue=)"[^"]+"', r'\1"0"'), # xml, lightxml
# Build details:
(r'(Config: Using QtTest library).*', r'\1'), # txt
(r'( *<QtBuild)>[^<]+</QtBuild>', r'\1/>'), # xml, lightxml
(r'(<property value=")[^"]+(" name="QtBuild"/>)', r'\1\2'), # xunitxml
# Line numbers in source files:
(r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt
(r'(\[Loc: [^[\]()]+)\(\d+\)', r'\1(0)'), # teamcity
(r'(<Incident.*\bfile=.*\bline=)"\d+"', r'\1"0"'), # lightxml, xml
),
precook = re.compile):
"""Private implementation details of __init__()."""
def getTestForPath(path):
if isWindows:
testpath = path + '\\' + path + '.exe'
else:
testpath = path + '/' + path
return testpath
qmake = ('..',) * 4 + ('bin', 'qmake')
qmake = os.path.join(*qmake)
def generateTestData(testname):
print(" running " + testname)
if os.path.sep in command:
scriptPath = os.path.abspath(command)
elif os.path.exists(command):
# e.g. if you typed "python3 generate_expected_output.py"
scriptPath = os.path.join(here, command)
else:
# From py 3.2: could use os.get_exec_path() here.
for d in os.environ.get('PATH', '').split(os.pathsep):
scriptPath = os.path.join(d, command)
if os.path.isfile(scriptPath):
break
else: # didn't break
raise Fail('Unable to find', command, 'in $PATH')
# Are we being run from the right place ?
myNames = scriptPath.split(os.path.sep)
if not (here.split(os.path.sep)[-5:] == myNames[-6:-1]
and os.path.isfile(qmake)):
raise Fail('Run', myNames[-1], 'in its directory of a completed build')
try:
qtver = subprocess.check_output([qmake, '-query', 'QT_VERSION'])
except OSError as what:
raise Fail(what.strerror)
qtver = qtver.strip().decode('utf-8')
scriptPath = os.path.dirname(scriptPath) # ditch leaf file-name
sentinel = os.path.sep + 'qtbase' + os.path.sep # '/qtbase/'
# Identify the path prefix of our qtbase ancestor directory
# (source, build and $PWD, when different); trim such prefixes
# off all paths we see.
roots = tuple(r[:r.find(sentinel) + 1].encode('unicode-escape').decode('utf-8')
for r in set((here, scriptPath, os.environ.get('PWD', '')))
if sentinel in r)
patterns += tuple((root, r'') for root in roots) + (
(r'\.'.join(qtver.split('.')), r'@INSERT_QT_VERSION_HERE@'),)
if any('-' in r for r in roots):
# Our xml formats replace hyphens with a character entity:
patterns += tuple((root.replace('-', '&#x0*2D;'), r'')
for root in roots if '-' in root)
return qtver, tuple((precook(p), r) for p, r in patterns)
del re
def clean(self, data):
"""Remove volatile details from test output.
Takes the full test output as a single (possibly huge)
multi-line string; iterates over cleaned lines of output."""
for line in data.split('\n'):
# Replace all occurrences of each regex:
for searchRe, replaceExp in self.__replace:
line = searchRe.sub(replaceExp, line)
yield line
def generateTestData(testname, clean,
formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity'),
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",
}):
"""Run one test and save its cleaned results.
Required arguments are the name of the test directory (the binary
it contains is expected to have the same name) and a function
that'll clean a test-run's output; see Cleaner.clean().
"""
# MS-Win: shall need to add .exe to this
path = os.path.join(testname, testname)
if not os.path.isfile(path):
print("Warning: directory", testname, "contains no test executable")
return
print(" running", testname)
for format in formats:
cmd = [getTestForPath(testname) + ' -' + format + ' ' + extraArgs.get(testname, '')]
result = 'expected_' + testname + '.' + format
data = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).communicate()[0]
out = open(result, 'wb')
out.write(data)
out.close()
replaceInFile(result)
cmd = [path, '-' + format]
if testname in extraArgs:
cmd += extraArgs[testname].split()
if isWindows:
print("This script does not work on Windows.")
exit()
data = subprocess.Popen(cmd, stdout=subprocess.PIPE,
universal_newlines=True).communicate()[0]
with open('expected_' + testname + '.' + format, 'w') as out:
out.write('\n'.join(clean(data))) # write() appends a newline, too
tests = sys.argv[1:]
os.environ['LC_ALL'] = 'C'
if len(tests) == 0:
tests = subdirs()
print("Generating " + str(len(tests)) + " test results for: " + qtver + " in: " + rootPath)
for path in tests:
if os.path.isfile(getTestForPath(path)):
generateTestData(path)
else:
print("Warning: directory " + path + " contains no test executable")
def main(name, *args):
"""Minimal argument parsing and driver for the real work"""
os.environ['LC_ALL'] = 'C'
herePath = os.getcwd()
cleaner = Cleaner(herePath, name)
tests = args if args else [d for d in os.listdir('.') if os.path.isdir(d)]
print("Generating", len(tests), "test results for", cleaner.version, "in:", herePath)
for path in tests:
generateTestData(path, cleaner.clean)
if __name__ == '__main__':
# Executed when script is run, not when imported (e.g. to debug)
import sys
if sys.platform.startswith('win'):
print("This script does not work on Windows.")
exit()
try:
main(*sys.argv)
except Fail as what:
sys.stderr.write('Failed: ' + ' '.join(what.args) + '\n')
exit(1)

2
tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
View File

@ -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
};

2
tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
View File

@ -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
};

2
tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
View File

@ -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
};

2
tests/auto/tools/uic/baseline/Main_Window.ui.h
View File

@ -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
};

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

@ -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
};

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

@ -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
};

34
tests/auto/tools/uic/baseline/addtorrentform.ui.h
View File

@ -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", "<none>", 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", "<none>", 0));
creatorLabel->setText(QApplication::translate("AddTorrentFile", "<none>", 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", "<none>", Q_NULLPTR));
label->setText(QApplication::translate("AddTorrentFile", "Torrent file:", Q_NULLPTR));
browseDestination->setText(QApplication::translate("AddTorrentFile", "Browse", Q_NULLPTR));
label_7->setText(QApplication::translate("AddTorrentFile", "Comment:", Q_NULLPTR));
commentLabel->setText(QApplication::translate("AddTorrentFile", "<none>", Q_NULLPTR));
creatorLabel->setText(QApplication::translate("AddTorrentFile", "<none>", Q_NULLPTR));
sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", Q_NULLPTR));
okButton->setText(QApplication::translate("AddTorrentFile", "&OK", Q_NULLPTR));
cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", Q_NULLPTR));
} // retranslateUi
};

12
tests/auto/tools/uic/baseline/authenticationdialog.ui.h
View File

@ -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
};

38
tests/auto/tools/uic/baseline/backside.ui.h
View File

@ -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

20
tests/auto/tools/uic/baseline/batchtranslation.ui.h
View File

@ -216,16 +216,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
};

12
tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
View File

@ -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
};

16
tests/auto/tools/uic/baseline/bookwindow.ui.h
View File

@ -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", "<b>Title:</b>", 0));
label_2_2_2_2->setText(QApplication::translate("BookWindow", "<b>Author: </b>", 0));
label_3->setText(QApplication::translate("BookWindow", "<b>Genre:</b>", 0));
label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", 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", "<b>Title:</b>", Q_NULLPTR));
label_2_2_2_2->setText(QApplication::translate("BookWindow", "<b>Author: </b>", Q_NULLPTR));
label_3->setText(QApplication::translate("BookWindow", "<b>Genre:</b>", Q_NULLPTR));
label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", Q_NULLPTR));
yearEdit->setPrefix(QString());
label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", 0));
label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", Q_NULLPTR));
} // retranslateUi
};

16
tests/auto/tools/uic/baseline/browserwidget.ui.h
View File

@ -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
};

4
tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h
View File

@ -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
};

56
tests/auto/tools/uic/baseline/calculator.ui.h
View File

@ -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
};

14
tests/auto/tools/uic/baseline/calculatorform.ui.h
View File

@ -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
};

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

@ -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
};

4
tests/auto/tools/uic/baseline/chatdialog.ui.h
View File

@ -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
};

24
tests/auto/tools/uic/baseline/chatmainwindow.ui.h
View File

@ -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
};

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

@ -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
};

74
tests/auto/tools/uic/baseline/config.ui.h
View File

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

12
tests/auto/tools/uic/baseline/connectdialog.ui.h
View File

@ -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
};

12
tests/auto/tools/uic/baseline/controller.ui.h
View File

@ -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
};

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

@ -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
};

18
tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
View File

@ -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
};

84
tests/auto/tools/uic/baseline/default.ui.h
View File

@ -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
};

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

@ -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
};

12
tests/auto/tools/uic/baseline/downloaditem.ui.h
View File

@ -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
};

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

@ -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
};

14
tests/auto/tools/uic/baseline/embeddeddialog.ui.h
View File

@ -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
};

2
tests/auto/tools/uic/baseline/enumnostdset.ui.h
View File

@ -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
};

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

@ -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
};

4
tests/auto/tools/uic/baseline/filternamedialog.ui.h
View File

@ -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
};

14
tests/auto/tools/uic/baseline/filterpage.ui.h
View File

@ -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
};

36
tests/auto/tools/uic/baseline/finddialog.ui.h
View File

@ -196,40 +196,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
};

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

@ -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
};

22
tests/auto/tools/uic/baseline/formwindowsettings.ui.h
View File

@ -274,17 +274,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
};

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

@ -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
};

10
tests/auto/tools/uic/baseline/gridalignment.ui.h
View File

@ -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
};

16
tests/auto/tools/uic/baseline/gridpanel.ui.h
View File

@ -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
};

66
tests/auto/tools/uic/baseline/helpdialog.ui.h
View File

@ -298,77 +298,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", "<b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p>", 0));
HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p>", Q_NULLPTR));
#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", "<b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p>", 0));
listContents->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p>", Q_NULLPTR));
#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", "<b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p>", 0));
editIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p>", Q_NULLPTR));
#endif // QT_NO_WHATSTHIS
#ifndef QT_NO_WHATSTHIS
listIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p>", 0));
listIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p>", Q_NULLPTR));
#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", "<b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p>", 0));
termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p>", Q_NULLPTR));
#endif // QT_NO_WHATSTHIS
#ifndef QT_NO_WHATSTHIS
resultBox->setWhatsThis(QApplication::translate("HelpDialog", "<b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p>", 0));
resultBox->setWhatsThis(QApplication::translate("HelpDialog", "<b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p>", Q_NULLPTR));
#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
};

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

@ -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
};

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

@ -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
};

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

@ -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
};

16
tests/auto/tools/uic/baseline/imagedialog.ui.h
View File

@ -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
};

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

@ -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
};

14
tests/auto/tools/uic/baseline/installdialog.ui.h
View File

@ -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
};

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

@ -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", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Move selected language up</p></body></html>", 0));
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Move selected language up</p></body></html>", Q_NULLPTR));
#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", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;\">Move selected language down</p></body></html>", 0));
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;\">Move selected language down</p></body></html>", Q_NULLPTR));
#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", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Remove selected language</p></body></html>", 0));
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Remove selected language</p></body></html>", Q_NULLPTR));
#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", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Open auxiliary language files</p></body></html>", 0));
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Open auxiliary language files</p></body></html>", Q_NULLPTR));
#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
};

24
tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
View File

@ -175,28 +175,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
};

48
tests/auto/tools/uic/baseline/mainwindow.ui.h
View File

@ -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
};

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

@ -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
};

22
tests/auto/tools/uic/baseline/myform.ui.h
View File

@ -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
};

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

@ -162,10 +162,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
};

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

@ -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
};

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

@ -134,11 +134,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
};

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

@ -133,13 +133,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

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

@ -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
};

88
tests/auto/tools/uic/baseline/pagefold.ui.h
View File

@ -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
};

18
tests/auto/tools/uic/baseline/paletteeditor.ui.h
View File

@ -199,16 +199,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
};

10
tests/auto/tools/uic/baseline/passworddialog.ui.h
View File

@ -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
};

10
tests/auto/tools/uic/baseline/pathpage.ui.h
View File

@ -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
};

32
tests/auto/tools/uic/baseline/phrasebookbox.ui.h
View File

@ -186,38 +186,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
};

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

@ -113,11 +113,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
};

10
tests/auto/tools/uic/baseline/preferencesdialog.ui.h
View File

@ -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
};

16
tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
View File

@ -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
};

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

@ -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
};

22
tests/auto/tools/uic/baseline/previewwidget.ui.h
View File

@ -237,20 +237,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
};

10
tests/auto/tools/uic/baseline/proxy.ui.h
View File

@ -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
};

16
tests/auto/tools/uic/baseline/qfiledialog.ui.h
View File

@ -273,26 +273,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

40
tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
View File

@ -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

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

@ -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
};

38
tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
View File

@ -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
};

18
tests/auto/tools/uic/baseline/qprintwidget.ui.h
View File

@ -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
};

24
tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
View File

@ -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
};

2
tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
View File

@ -92,7 +92,7 @@ public:
void retranslateUi(QDialog *QtGradientDialog)
{
QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", 0));
QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", Q_NULLPTR));
} // retranslateUi
};

112
tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
View File

@ -586,119 +586,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
};

10
tests/auto/tools/uic/baseline/qtgradientview.ui.h
View File

@ -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
};

Some files were not shown because too many files have changed in this diff Show More