diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /tests/manual | |
parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/manual.pro | 3 | ||||
-rw-r--r-- | tests/manual/qtexteditlist/main.cpp | 52 | ||||
-rw-r--r-- | tests/manual/qtexteditlist/qtexteditlist.pro | 8 | ||||
-rw-r--r-- | tests/manual/qtexteditlist/widget.cpp | 129 | ||||
-rw-r--r-- | tests/manual/qtexteditlist/widget.h | 67 | ||||
-rw-r--r-- | tests/manual/qtexteditlist/widget.ui | 61 | ||||
-rw-r--r-- | tests/manual/widgets/itemviews/itemviews.pro | 2 | ||||
-rw-r--r-- | tests/manual/widgets/qgraphicsview/qgraphicsview.pro | 2 | ||||
-rw-r--r-- | tests/manual/widgets/widgets.pro | 2 |
9 files changed, 325 insertions, 1 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 5a974842a4..4a466aa472 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -24,13 +24,14 @@ qpainfo \ qscreen \ qssloptions \ qtabletevent \ +qtexteditlist \ qtbug-8933 \ qtouchevent \ qwidget_zorder \ repaint \ socketengine \ textrendering \ -widgets/itemviews/delegate \ +widgets \ windowflags \ windowgeometry \ windowmodality \ diff --git a/tests/manual/qtexteditlist/main.cpp b/tests/manual/qtexteditlist/main.cpp new file mode 100644 index 0000000000..2b86928103 --- /dev/null +++ b/tests/manual/qtexteditlist/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 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, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "widget.h" +#include <QApplication> + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + Widget w; + w.show(); + + return a.exec(); +} diff --git a/tests/manual/qtexteditlist/qtexteditlist.pro b/tests/manual/qtexteditlist/qtexteditlist.pro new file mode 100644 index 0000000000..953333f3ee --- /dev/null +++ b/tests/manual/qtexteditlist/qtexteditlist.pro @@ -0,0 +1,8 @@ +#This project can be used to verify QTBUG-5111 case. +QT += core gui +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +TARGET = qtexteditlist +TEMPLATE = app +SOURCES += main.cpp widget.cpp +HEADERS += widget.h +FORMS += widget.ui diff --git a/tests/manual/qtexteditlist/widget.cpp b/tests/manual/qtexteditlist/widget.cpp new file mode 100644 index 0000000000..a03544e106 --- /dev/null +++ b/tests/manual/qtexteditlist/widget.cpp @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 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, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "widget.h" +#include "ui_widget.h" + +Widget::Widget(QWidget *parent) : + QWidget(parent), + ui(new Ui::Widget) +{ + ui->setupUi(this); + + // Changing font size and indent values to verify fix for QTBUG-5111. + connect(ui->spinBoxFontPointSize, SIGNAL(valueChanged(int)), this, SLOT(setFontPointSize(int))); + connect(ui->spinBoxIndentWidth, SIGNAL(valueChanged(int)), this, SLOT(setIndentWidth(int))); + + textCursor = new QTextCursor(ui->textEdit->document()); + + // Initialize text list with different formats and layouts + QTextListFormat listFormat; + // disc + listFormat.setStyle(QTextListFormat::ListDisc); + textCursor->insertList(listFormat); + textCursor->insertText("disc one"); + textCursor->insertText("\ndisc two"); + // 1., 2. + listFormat.setStyle(QTextListFormat::ListDecimal); + textCursor->insertList(listFormat); + textCursor->insertText("decimal one"); + textCursor->insertText("\ndecimal two"); + // a., b. + listFormat.setStyle(QTextListFormat::ListLowerAlpha); + textCursor->insertList(listFormat); + textCursor->insertText("lower alpha one"); + textCursor->insertText("\nlower alpha two"); + // A., B. + listFormat.setStyle(QTextListFormat::ListUpperAlpha); + textCursor->insertList(listFormat); + textCursor->insertText("upper alpha one"); + textCursor->insertText("\nupper alpha two"); + // Indent 1 + listFormat.setStyle(QTextListFormat::ListDisc); + listFormat.setIndent(1); + textCursor->insertList(listFormat); + textCursor->insertText("indent 1 one"); + textCursor->insertText("\nindent 2 two"); + // Indent 2 + listFormat.setIndent(2); + textCursor->insertList(listFormat); + textCursor->insertText("indent 2 one"); + textCursor->insertText("\nindent 2 two"); + // Indent 3 + listFormat.setIndent(3); + textCursor->insertList(listFormat); + textCursor->insertText("indent 3 one"); + textCursor->insertText("\nindent 3 two"); + // right to left: disc + listFormat.setIndent(1); + listFormat.setStyle(QTextListFormat::ListDisc); + textCursor->insertList(listFormat); + textCursor->insertText(QChar( 0x05d0)); // use Hebrew aleph to create a right-to-left layout + textCursor->insertText("\n" + QString(QChar( 0x05d0))); + // right to left: 1., 2. + listFormat.setStyle(QTextListFormat::ListLowerAlpha); + textCursor->insertList(listFormat); + textCursor->insertText(QChar( 0x05d0)); // use Hebrew aleph to create a right-to-left layout + textCursor->insertText("\n" + QString(QChar( 0x05d0))); + + QFont font; + setFontPointSize(font.pointSize()); + ui->textEdit->setFont(font); + + setIndentWidth(static_cast<int>(ui->textEdit->document()->indentWidth())); +} + +void Widget::setFontPointSize(int value) +{ + ui->textEdit->selectAll(); + ui->textEdit->setFontPointSize(value); +} + +void Widget::setIndentWidth(int value) +{ + ui->textEdit->document()->setIndentWidth(value); +} + +Widget::~Widget() +{ + delete ui; + delete textCursor; +} diff --git a/tests/manual/qtexteditlist/widget.h b/tests/manual/qtexteditlist/widget.h new file mode 100644 index 0000000000..e4f2d5a63f --- /dev/null +++ b/tests/manual/qtexteditlist/widget.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 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, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef WIDGET_H +#define WIDGET_H + +#include <QWidget> +#include <QTextCursor> + +namespace Ui { +class Widget; +} + +class Widget : public QWidget +{ + Q_OBJECT + +public: + explicit Widget(QWidget *parent = 0); + ~Widget(); +public slots: + void setFontPointSize(int value); + void setIndentWidth(int value); +private: + Ui::Widget *ui; + QTextCursor* textCursor; +}; + +#endif // WIDGET_H diff --git a/tests/manual/qtexteditlist/widget.ui b/tests/manual/qtexteditlist/widget.ui new file mode 100644 index 0000000000..d59a552ae6 --- /dev/null +++ b/tests/manual/qtexteditlist/widget.ui @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Widget</class> + <widget class="QWidget" name="Widget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Widget</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTextEdit" name="textEdit"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayoutFontPointSize"> + <item> + <widget class="QLabel" name="labelFontSize"> + <property name="text"> + <string>Font point size:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="spinBoxFontPointSize"> + <property name="value"> + <number>10</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayoutIndentWidth"> + <item> + <widget class="QLabel" name="labelIndentWidth"> + <property name="text"> + <string>Indent width:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="spinBoxIndentWidth"> + <property name="value"> + <number>40</number> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources/> + <connections/> +</ui> diff --git a/tests/manual/widgets/itemviews/itemviews.pro b/tests/manual/widgets/itemviews/itemviews.pro new file mode 100644 index 0000000000..58b02bfc0d --- /dev/null +++ b/tests/manual/widgets/itemviews/itemviews.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = delegate qheaderview qtreeview diff --git a/tests/manual/widgets/qgraphicsview/qgraphicsview.pro b/tests/manual/widgets/qgraphicsview/qgraphicsview.pro new file mode 100644 index 0000000000..243b28b040 --- /dev/null +++ b/tests/manual/widgets/qgraphicsview/qgraphicsview.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = rubberband diff --git a/tests/manual/widgets/widgets.pro b/tests/manual/widgets/widgets.pro new file mode 100644 index 0000000000..4e2e4c7cee --- /dev/null +++ b/tests/manual/widgets/widgets.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = itemviews qgraphicsview |