summaryrefslogtreecommitdiffstats
path: root/tests/auto/uic/baseline/helpdialog.ui.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/uic/baseline/helpdialog.ui.h')
-rw-r--r--tests/auto/uic/baseline/helpdialog.ui.h83
1 files changed, 42 insertions, 41 deletions
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index 6a7c5c2..b64e251 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -2,51 +2,52 @@
*********************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Assistant of the Qt Toolkit.
+** This file is part of the autotests of the Qt Toolkit.
**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://qt.nokia.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
**
*********************************************************************
*/
/********************************************************************************
-** Form generated from reading ui file 'helpdialog.ui'
+** Form generated from reading UI file 'helpdialog.ui'
**
-** Created: Mon Sep 1 09:31:03 2008
-** by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+** by: Qt User Interface Compiler version 4.6.0
**
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef HELPDIALOG_H
@@ -119,7 +120,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
tabWidget = new QTabWidget(HelpDialog);
tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
@@ -129,7 +130,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout1->setSpacing(6);
#endif
- vboxLayout1->setMargin(5);
+ vboxLayout1->setContentsMargins(5, 5, 5, 5);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
listContents = new QTreeWidget(contentPage);
listContents->setObjectName(QString::fromUtf8("listContents"));
@@ -146,7 +147,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(5);
+ vboxLayout2->setContentsMargins(5, 5, 5, 5);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
TextLabel1 = new QLabel(indexPage);
TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
@@ -171,7 +172,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout3->setSpacing(6);
#endif
- vboxLayout3->setMargin(5);
+ vboxLayout3->setContentsMargins(5, 5, 5, 5);
vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
listBookmarks = new QTreeWidget(bookmarkPage);
listBookmarks->setObjectName(QString::fromUtf8("listBookmarks"));
@@ -184,7 +185,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -210,7 +211,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(5);
+ gridLayout->setContentsMargins(5, 5, 5, 5);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
@@ -241,7 +242,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(1);
+ hboxLayout1->setContentsMargins(1, 1, 1, 1);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
helpButton = new QPushButton(searchPage);
helpButton->setObjectName(QString::fromUtf8("helpButton"));
@@ -273,7 +274,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout2->setSpacing(6);
#endif
- hboxLayout2->setMargin(3);
+ hboxLayout2->setContentsMargins(3, 3, 3, 3);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
labelPrepare = new QLabel(framePrepare);
labelPrepare->setObjectName(QString::fromUtf8("labelPrepare"));