aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-12-17 13:44:11 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-01-15 11:07:29 +0100
commit0f38777d23b160902cb9b476098e0da6cd097068 (patch)
tree480a0866cc86ec6bc9a8ded22220a8a2eebc7619 /tests
parent26e4f4f2150a4753752e33d9ad526d89314abe8f (diff)
Extend manual thumbnail test.
Add check boxes for iconicThumbnailPixmap/iconicLivePreviewPixmap to be able to test them separately. Task-number: QTBUG-42608 Change-Id: I7ed1faeec36a3c809613db2d68918cd48e96fe9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/thumbnail/main.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/manual/thumbnail/main.cpp b/tests/manual/thumbnail/main.cpp
index 96b10fd..c39fd99 100644
--- a/tests/manual/thumbnail/main.cpp
+++ b/tests/manual/thumbnail/main.cpp
@@ -81,15 +81,25 @@ public slots:
private:
QWinThumbnailToolBar *m_thumbnailToolBar;
QPlainTextEdit *m_logEdit;
+ QAction *m_enableIconicPixmapAction;
+ QAction *m_enableIconicLivePreviewAction;
};
MainWindow::MainWindow()
: m_thumbnailToolBar(new QWinThumbnailToolBar(this))
, m_logEdit(new QPlainTextEdit)
+ , m_enableIconicPixmapAction(new QAction("Enable Iconic Pixmap", this))
+ , m_enableIconicLivePreviewAction(new QAction("Enable LivePreview", this))
{
setMinimumWidth(400);
setWindowTitle(QStringLiteral("QWinThumbnailToolBar ") + QLatin1String(QT_VERSION_STR));
QMenu *fileMenu = menuBar()->addMenu("&File");
+ m_enableIconicPixmapAction->setCheckable(true);
+ m_enableIconicPixmapAction->setChecked(true);
+ m_enableIconicLivePreviewAction->setCheckable(true);
+ m_enableIconicLivePreviewAction->setChecked(true);
+ fileMenu->addAction(m_enableIconicPixmapAction);
+ fileMenu->addAction(m_enableIconicLivePreviewAction);
QAction *quitAction = fileMenu->addAction("&Quit");
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
connect(quitAction, &QAction::triggered, QCoreApplication::quit);
@@ -126,6 +136,8 @@ void MainWindow::testButtonClicked()
void MainWindow::updateIconicThumbnailPixmap()
{
static int n = 1;
+ if (!m_enableIconicPixmapAction->isChecked())
+ return;
const QString number = QString::number(n++);
logText(QLatin1String(__FUNCTION__) + QLatin1Char(' ') + number);
const QPixmap pixmap =
@@ -136,6 +148,8 @@ void MainWindow::updateIconicThumbnailPixmap()
void MainWindow::updateIconicLivePreviewPixmap()
{
static int n = 1;
+ if (!m_enableIconicLivePreviewAction->isChecked())
+ return;
const QString number = QString::number(n++);
logText(QLatin1String(__FUNCTION__) + QLatin1Char(' ') + number);
const QPixmap pixmap =