diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /tests/manual | |
parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/cocoa/appicon/README | 3 | ||||
-rw-r--r-- | tests/manual/cocoa/appicon/appicon.pro | 4 | ||||
-rw-r--r-- | tests/manual/cocoa/appicon/main.cpp | 68 |
3 files changed, 75 insertions, 0 deletions
diff --git a/tests/manual/cocoa/appicon/README b/tests/manual/cocoa/appicon/README new file mode 100644 index 0000000000..ecef1286ff --- /dev/null +++ b/tests/manual/cocoa/appicon/README @@ -0,0 +1,3 @@ +Test for checking that the dock icon is changed when +QGuiApplication::setWindowIcon() is called. Clicking the +buttong should change the entry in the dock to a red icon. diff --git a/tests/manual/cocoa/appicon/appicon.pro b/tests/manual/cocoa/appicon/appicon.pro new file mode 100644 index 0000000000..87df7b872c --- /dev/null +++ b/tests/manual/cocoa/appicon/appicon.pro @@ -0,0 +1,4 @@ +QT += widgets +TEMPLATE = app +TARGET = appicon +SOURCES += main.cpp diff --git a/tests/manual/cocoa/appicon/main.cpp b/tests/manual/cocoa/appicon/main.cpp new file mode 100644 index 0000000000..9e00e4e64c --- /dev/null +++ b/tests/manual/cocoa/appicon/main.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** + ** + ** Copyright (C) 2015 The Qt Company Ltd. + ** Contact: http://www.qt.io/licensing/ + ** + ** This file is part of the test suite of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:LGPL21$ + ** 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 The Qt Company. For licensing terms + ** and conditions see http://www.qt.io/terms-conditions. For further + ** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free + ** Software Foundation and appearing in the file LICENSE.LGPLv21 and + ** LICENSE.LGPLv3 included in the packaging of this file. Please review the + ** following information to ensure the GNU Lesser General Public License + ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and + ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + ** + ** As a special exception, The Qt Company gives you certain additional + ** rights. These rights are described in The Qt Company LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +#include <QApplication> +#include <QPushButton> +#include <QVBoxLayout> + +class TopWidget : public QWidget +{ + Q_OBJECT +public: + TopWidget(QWidget *parent = 0) : QWidget(parent) + { + QVBoxLayout *layout = new QVBoxLayout; + QPushButton *button = new QPushButton("Change app icon"); + connect(button, SIGNAL(clicked()), this, SLOT(changeIcon())); + layout->addWidget(button); + setLayout(layout); + } +public slots: + void changeIcon() + { + QPixmap pix(32, 32); + pix.fill(Qt::red); + QIcon i(pix); + qApp->setWindowIcon(i); + } +}; + +#include "main.moc" + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); + TopWidget w; + w.show(); + return a.exec(); +} |