AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
aff0915352
qt5base-lts/tests/auto/gui/image/qicon/tst_qicon.cpp

866 lines
32 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-05-10 10:06:48 +00:00
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Replace QtTest headers with QTest Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-11-26 16:31:50 +00:00
#include <QTest>
test: fixed failure of tst_qicon This test unconditionally assumed that SVG support was available. This is an invalid circular dependency: the test is in qtbase and depends on qtsvg, which depends on qtbase. Change the test so that it uses SVG support only if available. Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495 Reviewed-on: http://codereview.qt.nokia.com/2426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-01 06:44:09 +00:00
#include <QImageReader>
Replace QtTest headers with QTest Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-11-26 16:31:50 +00:00
#include <QBuffer>
#include <QStandardPaths>
QIcon: Use the @nx pixmaps in the paint method Make use of the device pixel ratio in the QIcon paint method so the @nx hi-dpi pixmaps are selected when appropriate when painting to a QPainter. Pick-to: 6.0 Fixes: QTBUG-90042 Change-Id: I53995a2285ef879e3c4fddb9f8da702e256a260f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2021-01-22 10:14:22 +00:00
#include <QPainter>
Compile autotests for Integrity - process environment/DNS are OFF for INTEGRITY Task-number: QTBUG-96176 Pick-to: 6.2 Change-Id: I189a97f88c96a428586c31a66b8d250e04482900 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-09-06 07:11:06 +00:00
#if QT_CONFIG(process)
Replace QtTest headers with QTest Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-11-26 16:31:50 +00:00
#include <QProcess>
Compile autotests for Integrity - process environment/DNS are OFF for INTEGRITY Task-number: QTBUG-96176 Pick-to: 6.2 Change-Id: I189a97f88c96a428586c31a66b8d250e04482900 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-09-06 07:11:06 +00:00
#endif
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#include <qicon.h>
#include <qiconengine.h>
Remove qSort usages from gui tests QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Idf0fc471f8ab7b30a097d8faf93c93d5ebbb03ef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-17 22:37:05 +00:00
#include <algorithm>
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
class tst_QIcon : public QObject
{
Q_OBJECT
public:
tst_QIcon();
private slots:
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
void initTestCase();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void actualSize_data(); // test with 1 pixmap
void actualSize();
void actualSize2_data(); // test with 2 pixmaps with different aspect ratio
void actualSize2();
void isNull();
Fix possible null pointer dereferences. This follows up 130c2baa9376dcf525916620294bd9996bdf41f3. Change-Id: I2f6c9b4f995af427cec9a2162b782039debf8564 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2015-12-02 08:27:49 +00:00
void isMask();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void swap();
void bestMatch();
void cacheKey();
void detach();
void addFile();
QIcon: Add pixmap() overload which take devicePixelRatio Add new QIcon::pixmap() overload: QPixmap pixmap(const QSize &size, qreal devicePixelRatio, ...) This function replaces the existing pixmap() function which take a QWindow pointer, and should be more convenient in use. Task-number: QTBUG-85885 Change-Id: Ie4ca96a266d9278864678dc61bdfc2836cabdb93 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-08-06 14:14:30 +00:00
void pixmap();
QIcon: Use the @nx pixmaps in the paint method Make use of the device pixel ratio in the QIcon paint method so the @nx hi-dpi pixmaps are selected when appropriate when painting to a QPainter. Pick-to: 6.0 Fixes: QTBUG-90042 Change-Id: I53995a2285ef879e3c4fddb9f8da702e256a260f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2021-01-22 10:14:22 +00:00
void paint();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void availableSizes();
void name();
void streamAvailableSizes_data();
void streamAvailableSizes();
void fromTheme();
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
void fromThemeCache();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Make qicon autotest build without widgets Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-05 11:35:14 +00:00
#ifndef QT_NO_WIDGETS
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void task184901_badCache();
Make qicon autotest build without widgets Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-05 11:35:14 +00:00
#endif
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void task223279_inconsistentAddFile();
private:
test: fixed failure of tst_qicon This test unconditionally assumed that SVG support was available. This is an invalid circular dependency: the test is in qtbase and depends on qtsvg, which depends on qtbase. Change the test so that it uses SVG support only if available. Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495 Reviewed-on: http://codereview.qt.nokia.com/2426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-01 06:44:09 +00:00
bool haveImageFormat(QByteArray const&);
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
const QString m_pngImageFileName;
const QString m_pngRectFileName;
const QString m_sourceFileName;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
};
test: fixed failure of tst_qicon This test unconditionally assumed that SVG support was available. This is an invalid circular dependency: the test is in qtbase and depends on qtsvg, which depends on qtbase. Change the test so that it uses SVG support only if available. Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495 Reviewed-on: http://codereview.qt.nokia.com/2426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-01 06:44:09 +00:00
bool tst_QIcon::haveImageFormat(QByteArray const& desiredFormat)
{
return QImageReader::supportedImageFormats().contains(desiredFormat);
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
tst_QIcon::tst_QIcon()
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
: m_pngImageFileName(QFINDTESTDATA("image.png"))
, m_pngRectFileName(QFINDTESTDATA("rect.png"))
Fix tst_QIcon for configurations with builtin_testdata Change-Id: Ibf9fcf7d3a8d58c9c488637a45985593950defaf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-24 08:45:37 +00:00
, m_sourceFileName(":/tst_qicon.cpp")
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
{
}
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
void tst_QIcon::initTestCase()
{
QVERIFY(!m_pngImageFileName.isEmpty());
QVERIFY(!m_pngRectFileName.isEmpty());
QVERIFY(!m_sourceFileName.isEmpty());
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void tst_QIcon::actualSize_data()
{
QTest::addColumn<QString>("source");
QTest::addColumn<QSize>("argument");
QTest::addColumn<QSize>("result");
// square image
QTest::newRow("resource0") << ":/image.png" << QSize(128, 128) << QSize(128, 128);
QTest::newRow("resource1") << ":/image.png" << QSize( 64, 64) << QSize( 64, 64);
QTest::newRow("resource2") << ":/image.png" << QSize( 32, 64) << QSize( 32, 32);
QTest::newRow("resource3") << ":/image.png" << QSize( 16, 64) << QSize( 16, 16);
QTest::newRow("resource4") << ":/image.png" << QSize( 16, 128) << QSize( 16, 16);
QTest::newRow("resource5") << ":/image.png" << QSize( 128, 16) << QSize( 16, 16);
QTest::newRow("resource6") << ":/image.png" << QSize( 150, 150) << QSize( 128, 128);
// rect image
QTest::newRow("resource7") << ":/rect.png" << QSize( 20, 40) << QSize( 20, 40);
QTest::newRow("resource8") << ":/rect.png" << QSize( 10, 20) << QSize( 10, 20);
QTest::newRow("resource9") << ":/rect.png" << QSize( 15, 50) << QSize( 15, 30);
QTest::newRow("resource10") << ":/rect.png" << QSize( 25, 50) << QSize( 20, 40);
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
QTest::newRow("external0") << m_pngImageFileName << QSize(128, 128) << QSize(128, 128);
QTest::newRow("external1") << m_pngImageFileName << QSize( 64, 64) << QSize( 64, 64);
QTest::newRow("external2") << m_pngImageFileName << QSize( 32, 64) << QSize( 32, 32);
QTest::newRow("external3") << m_pngImageFileName << QSize( 16, 64) << QSize( 16, 16);
QTest::newRow("external4") << m_pngImageFileName << QSize( 16, 128) << QSize( 16, 16);
QTest::newRow("external5") << m_pngImageFileName << QSize(128, 16) << QSize( 16, 16);
QTest::newRow("external6") << m_pngImageFileName << QSize(150, 150) << QSize(128, 128);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// rect image
QTest::newRow("external7") << ":/rect.png" << QSize( 20, 40) << QSize( 20, 40);
QTest::newRow("external8") << ":/rect.png" << QSize( 10, 20) << QSize( 10, 20);
QTest::newRow("external9") << ":/rect.png" << QSize( 15, 50) << QSize( 15, 30);
QTest::newRow("external10") << ":/rect.png" << QSize( 25, 50) << QSize( 20, 40);
}
void tst_QIcon::actualSize()
{
QFETCH(QString, source);
QFETCH(QSize, argument);
QFETCH(QSize, result);
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
// Skip two corner cases
if (qApp->devicePixelRatio() > 1 && (qstrcmp(QTest::currentDataTag(), "resource9") == 0
|| qstrcmp(QTest::currentDataTag(), "external9") == 0))
QSKIP("Behavior is unspecified for devicePixelRatio > 1", QTest::QSkipAll);
auto expectedDeviceSize = [](QSize deviceIndependentExpectedSize, QSize maxSourceImageSize) -> QSize {
qreal dpr = qApp->devicePixelRatio();
Fix tst_qicon for fractional dpr Add rounding one place, and skip addFile for now since the assumption about rounding dpr up no longer applies. Pick-to: 6.1 Change-Id: I0a84dfabb218acf42cb3816ba50ef899c8762523 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2021-04-07 09:31:10 +00:00
return QSize(qMin(qRound(deviceIndependentExpectedSize.width() * dpr), maxSourceImageSize.width()),
qMin(qRound(deviceIndependentExpectedSize.height() * dpr), maxSourceImageSize.height()));
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
};
QSize sourceSize = QImage(source).size();
QSize deviceIndependentSize = result;
QSize deviceSize = expectedDeviceSize(result, sourceSize);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
{
QPixmap pixmap(source);
QIcon icon(pixmap);
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
QCOMPARE(icon.actualSize(argument), deviceIndependentSize);
QCOMPARE(icon.pixmap(argument).size(), deviceSize);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
{
QIcon icon(source);
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
QCOMPARE(icon.actualSize(argument), deviceIndependentSize);
QCOMPARE(icon.pixmap(argument).size(), deviceSize);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
}
void tst_QIcon::actualSize2_data()
{
QTest::addColumn<QSize>("argument");
QTest::addColumn<QSize>("result");
// two images - 128x128 and 20x40. Let the games begin
QTest::newRow("trivial1") << QSize( 128, 128) << QSize( 128, 128);
QTest::newRow("trivial2") << QSize( 20, 40) << QSize( 20, 40);
// QIcon chooses the one with the smallest area to choose the pixmap
QTest::newRow("best1") << QSize( 100, 100) << QSize( 100, 100);
QTest::newRow("best2") << QSize( 20, 20) << QSize( 10, 20);
QTest::newRow("best3") << QSize( 15, 30) << QSize( 15, 30);
QTest::newRow("best4") << QSize( 5, 5) << QSize( 2, 5);
QTest::newRow("best5") << QSize( 10, 15) << QSize( 7, 15);
}
void tst_QIcon::actualSize2()
{
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
if (qApp->devicePixelRatio() > 1)
QSKIP("Behavior is unspecified for devicePixelRatio > 1", QTest::SkipAll);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QIcon icon;
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
icon.addPixmap(m_pngImageFileName);
icon.addPixmap(m_pngRectFileName);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QFETCH(QSize, argument);
QFETCH(QSize, result);
QCOMPARE(icon.actualSize(argument), result);
QCOMPARE(icon.pixmap(argument).size(), result);
}
void tst_QIcon::isNull() {
// test default constructor
QIcon defaultConstructor;
QVERIFY(defaultConstructor.isNull());
// test copy constructor
QVERIFY(QIcon(defaultConstructor).isNull());
// test pixmap constructor
QPixmap nullPixmap;
QVERIFY(QIcon(nullPixmap).isNull());
// test string constructor with empty string
QIcon iconEmptyString = QIcon(QString());
QVERIFY(iconEmptyString.isNull());
QVERIFY(!iconEmptyString.actualSize(QSize(32, 32)).isValid());;
// test string constructor with non-existing file
QIcon iconNoFile = QIcon("imagedoesnotexist");
QVERIFY(!iconNoFile.isNull());
QVERIFY(!iconNoFile.actualSize(QSize(32, 32)).isValid());
// test string constructor with non-existing file with suffix
QIcon iconNoFileSuffix = QIcon("imagedoesnotexist.png");
QVERIFY(!iconNoFileSuffix.isNull());
QVERIFY(!iconNoFileSuffix.actualSize(QSize(32, 32)).isValid());
// test string constructor with existing file but unsupported format
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
QIcon iconUnsupportedFormat = QIcon(m_sourceFileName);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QVERIFY(!iconUnsupportedFormat.isNull());
QVERIFY(!iconUnsupportedFormat.actualSize(QSize(32, 32)).isValid());
// test string constructor with existing file and supported format
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
QIcon iconSupportedFormat = QIcon(m_pngImageFileName);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QVERIFY(!iconSupportedFormat.isNull());
QVERIFY(iconSupportedFormat.actualSize(QSize(32, 32)).isValid());
}
Fix possible null pointer dereferences. This follows up 130c2baa9376dcf525916620294bd9996bdf41f3. Change-Id: I2f6c9b4f995af427cec9a2162b782039debf8564 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2015-12-02 08:27:49 +00:00
void tst_QIcon::isMask()
{
QIcon icon;
icon.setIsMask(true);
icon.addPixmap(QPixmap());
QVERIFY(icon.isMask());
QIcon icon2;
icon2.setIsMask(true);
QVERIFY(icon2.isMask());
icon2.setIsMask(false);
QVERIFY(!icon2.isMask());
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void tst_QIcon::swap()
{
QPixmap p1(1, 1), p2(2, 2);
p1.fill(Qt::black);
p2.fill(Qt::black);
QIcon i1(p1), i2(p2);
const qint64 i1k = i1.cacheKey();
const qint64 i2k = i2.cacheKey();
QVERIFY(i1k != i2k);
i1.swap(i2);
QCOMPARE(i1.cacheKey(), i2k);
QCOMPARE(i2.cacheKey(), i1k);
}
void tst_QIcon::bestMatch()
{
QPixmap p1(1, 1);
QPixmap p2(2, 2);
QPixmap p3(3, 3);
QPixmap p4(4, 4);
QPixmap p5(5, 5);
QPixmap p6(6, 6);
QPixmap p7(7, 7);
QPixmap p8(8, 8);
p1.fill(Qt::black);
p2.fill(Qt::black);
p3.fill(Qt::black);
p4.fill(Qt::black);
p5.fill(Qt::black);
p6.fill(Qt::black);
p7.fill(Qt::black);
p8.fill(Qt::black);
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 2; ++j) {
QIcon::State state = (j == 0) ? QIcon::On : QIcon::Off;
QIcon::State oppositeState = (state == QIcon::On) ? QIcon::Off
: QIcon::On;
QIcon::Mode mode;
QIcon::Mode oppositeMode;
QIcon icon;
switch (i) {
case 0:
default:
mode = QIcon::Normal;
oppositeMode = QIcon::Active;
break;
case 1:
mode = QIcon::Active;
oppositeMode = QIcon::Normal;
break;
case 2:
mode = QIcon::Disabled;
oppositeMode = QIcon::Selected;
break;
case 3:
mode = QIcon::Selected;
oppositeMode = QIcon::Disabled;
}
/*
The test mirrors the code in
QPixmapIconEngine::bestMatch(), to make sure that
nobody breaks QPixmapIconEngine by mistake. Before
you change this test or the code that it tests,
please talk to the maintainer if possible.
*/
if (mode == QIcon::Disabled || mode == QIcon::Selected) {
icon.addPixmap(p1, oppositeMode, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p1.size());
icon.addPixmap(p2, oppositeMode, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p2.size());
icon.addPixmap(p3, QIcon::Active, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p3.size());
icon.addPixmap(p4, QIcon::Normal, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p4.size());
icon.addPixmap(p5, mode, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p5.size());
icon.addPixmap(p6, QIcon::Active, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p6.size());
icon.addPixmap(p7, QIcon::Normal, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p7.size());
icon.addPixmap(p8, mode, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p8.size());
} else {
icon.addPixmap(p1, QIcon::Selected, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p1.size());
icon.addPixmap(p2, QIcon::Disabled, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p2.size());
icon.addPixmap(p3, QIcon::Selected, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p3.size());
icon.addPixmap(p4, QIcon::Disabled, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p4.size());
icon.addPixmap(p5, oppositeMode, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p5.size());
icon.addPixmap(p6, mode, oppositeState);
QVERIFY(icon.pixmap(100, mode, state).size() == p6.size());
icon.addPixmap(p7, oppositeMode, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p7.size());
icon.addPixmap(p8, mode, state);
QVERIFY(icon.pixmap(100, mode, state).size() == p8.size());
}
}
}
}
void tst_QIcon::cacheKey()
{
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
QIcon icon1(m_pngImageFileName);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qint64 icon1_key = icon1.cacheKey();
QIcon icon2 = icon1;
tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I624deb320c378c18a29b3707f48583d53bfd5186 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-07-30 13:15:12 +00:00
QCOMPARE(icon2.cacheKey(), icon1.cacheKey());
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
icon2.detach();
QVERIFY(icon2.cacheKey() != icon1.cacheKey());
tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I624deb320c378c18a29b3707f48583d53bfd5186 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-07-30 13:15:12 +00:00
QCOMPARE(icon1.cacheKey(), icon1_key);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
void tst_QIcon::detach()
{
QImage img(32, 32, QImage::Format_ARGB32_Premultiplied);
img.fill(0xffff0000);
QIcon icon1(QPixmap::fromImage(img));
QIcon icon2 = icon1;
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
icon2.addFile(m_pngImageFileName, QSize(64, 64));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QImage img1 = icon1.pixmap(64, 64).toImage();
QImage img2 = icon2.pixmap(64, 64).toImage();
QVERIFY(img1 != img2);
img1 = icon1.pixmap(32, 32).toImage();
img2 = icon2.pixmap(32, 32).toImage();
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
if (qApp->devicePixelRatio() > 1)
QVERIFY(img1 != img2); // we get an e.g. 64x64 image in dpr=2 displays
else
QCOMPARE(img1, img2);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
void tst_QIcon::addFile()
{
Fix tst_qicon for fractional dpr Add rounding one place, and skip addFile for now since the assumption about rounding dpr up no longer applies. Pick-to: 6.1 Change-Id: I0a84dfabb218acf42cb3816ba50ef899c8762523 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2021-04-07 09:31:10 +00:00
if (qApp->devicePixelRatio() != int(qApp->devicePixelRatio()))
QSKIP("Test is not ready for non integer devicePixelRatio", QTest::SkipAll);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QIcon icon;
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png"));
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-64.png"));
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-128.png"));
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-64.png"), QSize(), QIcon::Selected);
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
const int maxImageSize = 128;
auto expectedHighDpiImage = [=](int deviceIndependentSize, const QString &imagePathTemplate) -> QImage {
const int expectedImageSize = qMin(maxImageSize, deviceIndependentSize * qCeil(qApp->devicePixelRatio()));
const int expectedImageDpr = expectedImageSize / deviceIndependentSize;
const QString path = imagePathTemplate.arg(expectedImageSize);
QPixmap image(path);
image.setDevicePixelRatio(expectedImageDpr);
return image.toImage();
};
QCOMPARE(icon.pixmap(16, QIcon::Normal).toImage(),
expectedHighDpiImage(16, ":/styles/commonstyle/images/standardbutton-open-%1.png"));
QCOMPARE(icon.pixmap(32, QIcon::Normal).toImage(),
expectedHighDpiImage(32, ":/styles/commonstyle/images/standardbutton-open-%1.png"));
QCOMPARE(icon.pixmap(64, QIcon::Normal).toImage(),
expectedHighDpiImage(64, ":/styles/commonstyle/images/standardbutton-open-%1.png"));
QCOMPARE(icon.pixmap(128, QIcon::Normal).toImage(),
expectedHighDpiImage(128, ":/styles/commonstyle/images/standardbutton-open-%1.png"));
QCOMPARE(icon.pixmap(16, QIcon::Selected).toImage(),
expectedHighDpiImage(16, ":/styles/commonstyle/images/standardbutton-save-%1.png"));
QCOMPARE(icon.pixmap(32, QIcon::Selected).toImage(),
expectedHighDpiImage(32, ":/styles/commonstyle/images/standardbutton-save-%1.png"));
QCOMPARE(icon.pixmap(64, QIcon::Selected).toImage(),
expectedHighDpiImage(64, ":/styles/commonstyle/images/standardbutton-save-%1.png"));
QCOMPARE(icon.pixmap(128, QIcon::Selected).toImage(),
expectedHighDpiImage(128, ":/styles/commonstyle/images/standardbutton-save-%1.png"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
QIcon: Add pixmap() overload which take devicePixelRatio Add new QIcon::pixmap() overload: QPixmap pixmap(const QSize &size, qreal devicePixelRatio, ...) This function replaces the existing pixmap() function which take a QWindow pointer, and should be more convenient in use. Task-number: QTBUG-85885 Change-Id: Ie4ca96a266d9278864678dc61bdfc2836cabdb93 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-08-06 14:14:30 +00:00
void tst_QIcon::pixmap()
{
QIcon icon;
icon.addFile(m_pngImageFileName, QSize(64, 64));
// Exercise all pixmap() API overloads
QVERIFY(icon.pixmap(16).size().width() >= 16);
QVERIFY(icon.pixmap(16, 16).size().width() >= 16);
QVERIFY(icon.pixmap(QSize(16, 16)).size().width() >= 16);
QVERIFY(icon.pixmap(QSize(16, 16), 1).size().width() == 16);
Fix deprecation warnings in tests Adjust to changes to QIcon::pixmap, QMetaType::type, and QAbstractItemView::itemDelegate. Change-Id: I9eb0331ef899131afc86c33f27feeee76331ffc8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-16 15:49:05 +00:00
QVERIFY(icon.pixmap(QSize(16, 16), -1).size().width() >= 16);
QIcon: Add pixmap() overload which take devicePixelRatio Add new QIcon::pixmap() overload: QPixmap pixmap(const QSize &size, qreal devicePixelRatio, ...) This function replaces the existing pixmap() function which take a QWindow pointer, and should be more convenient in use. Task-number: QTBUG-85885 Change-Id: Ie4ca96a266d9278864678dc61bdfc2836cabdb93 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-08-06 14:14:30 +00:00
}
QIcon: Use the @nx pixmaps in the paint method Make use of the device pixel ratio in the QIcon paint method so the @nx hi-dpi pixmaps are selected when appropriate when painting to a QPainter. Pick-to: 6.0 Fixes: QTBUG-90042 Change-Id: I53995a2285ef879e3c4fddb9f8da702e256a260f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2021-01-22 10:14:22 +00:00
void tst_QIcon::paint()
{
QImage img16_1x(16, 16, QImage::Format_ARGB32);
img16_1x.fill(qRgb(0, 0, 0xff));
img16_1x.setDevicePixelRatio(1.);
QImage img16_2x(32, 32, QImage::Format_ARGB32);
img16_2x.fill(qRgb(0, 0xff, 0xff));
img16_2x.setDevicePixelRatio(2.);
QImage img32_1x(32, 32, QImage::Format_ARGB32);
img32_1x.fill(qRgb(0xff, 0, 0));
img32_1x.setDevicePixelRatio(1.);
QImage img32_2x(64, 64, QImage::Format_ARGB32);
img32_2x.fill(qRgb(0x0, 0xff, 0));
img32_2x.setDevicePixelRatio(2.);
QIcon icon;
icon.addPixmap(QPixmap::fromImage(img16_1x));
icon.addPixmap(QPixmap::fromImage(img16_2x));
icon.addPixmap(QPixmap::fromImage(img32_1x));
icon.addPixmap(QPixmap::fromImage(img32_2x));
// Test painting the icon version with a device independent size of 32x32
QRect iconRect(0, 0, 32, 32);
auto imageWithPaintedIconAtDpr = [&](qreal dpr) {
QImage paintDevice(64 * dpr, 64 * dpr, QImage::Format_ARGB32);
paintDevice.setDevicePixelRatio(dpr);
QPainter painter(&paintDevice);
icon.paint(&painter, iconRect);
return paintDevice;
};
QImage imageWithIcon1x = imageWithPaintedIconAtDpr(1.0);
QCOMPARE(imageWithIcon1x.pixel(iconRect.center()), qRgb(0xff, 0, 0));
QImage imageWithIcon2x = imageWithPaintedIconAtDpr(2.0);
QCOMPARE(imageWithIcon2x.pixel(iconRect.center()), qRgb(0, 0xff, 0));
QImage imageWithIcon3x = imageWithPaintedIconAtDpr(3.0);
QCOMPARE(imageWithIcon3x.pixel(iconRect.center()), qRgb(0, 0xff, 0));
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
static bool sizeLess(const QSize &a, const QSize &b)
{
return a.width() < b.width();
}
void tst_QIcon::availableSizes()
{
{
QIcon icon;
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
icon.addFile(m_pngImageFileName, QSize(32,32));
icon.addFile(m_pngImageFileName, QSize(64,64));
icon.addFile(m_pngImageFileName, QSize(128,128));
icon.addFile(m_pngImageFileName, QSize(256,256), QIcon::Disabled);
icon.addFile(m_pngImageFileName, QSize(16,16), QIcon::Normal, QIcon::On);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QList<QSize> availableSizes = icon.availableSizes();
QCOMPARE(availableSizes.size(), 3);
Remove qSort usages from gui tests QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Idf0fc471f8ab7b30a097d8faf93c93d5ebbb03ef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-17 22:37:05 +00:00
std::sort(availableSizes.begin(), availableSizes.end(), sizeLess);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QCOMPARE(availableSizes.at(0), QSize(32,32));
QCOMPARE(availableSizes.at(1), QSize(64,64));
QCOMPARE(availableSizes.at(2), QSize(128,128));
availableSizes = icon.availableSizes(QIcon::Disabled);
QCOMPARE(availableSizes.size(), 1);
QCOMPARE(availableSizes.at(0), QSize(256,256));
availableSizes = icon.availableSizes(QIcon::Normal, QIcon::On);
QCOMPARE(availableSizes.size(), 1);
QCOMPARE(availableSizes.at(0), QSize(16,16));
}
{
// we try to load an icon from resources
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
QIcon icon(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QList<QSize> availableSizes = icon.availableSizes();
QCOMPARE(availableSizes.size(), 1);
QCOMPARE(availableSizes.at(0), QSize(16, 16));
}
{
// load an icon from binary data.
QPixmap pix;
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
QFile file(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QVERIFY(file.open(QIODevice::ReadOnly));
uchar *data = file.map(0, file.size());
QVERIFY(data != 0);
pix.loadFromData(data, file.size());
QIcon icon(pix);
QList<QSize> availableSizes = icon.availableSizes();
QCOMPARE(availableSizes.size(), 1);
QCOMPARE(availableSizes.at(0), QSize(16,16));
}
{
// there shouldn't be available sizes for invalid images!
QVERIFY(QIcon(QLatin1String("")).availableSizes().isEmpty());
QVERIFY(QIcon(QLatin1String("non-existing.png")).availableSizes().isEmpty());
}
}
void tst_QIcon::name()
{
QIcon: use fallback also with platform icon engine Amends a452e2254644ffbed289fdf051eaf41d7e6a3b0d. No new tests, existing tests fails when QPlatformTheme returns a QIconEngine implementation that provides the tested icons. However, the existing test fails when the platform icon engine provides and address-book-new icon, and depends on the order of test functions, as the name() test function modifies the global theme name and search path. Fix those issues in the test. Pick-to: 6.6 Change-Id: Ie1c1d14f08fad5e906296bab662df5cfacdbbf07 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-07-13 13:24:35 +00:00
const auto reset = qScopeGuard([]{
QIcon::setThemeName({});
QIcon::setThemeSearchPaths({});
});
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
{
// No name if icon does not come from a theme
QIcon icon(":/image.png");
QString name = icon.name();
QVERIFY(name.isEmpty());
}
{
// Getting the name of an icon coming from a theme should work
QString searchPath = QLatin1String(":/icons");
QIcon::setThemeSearchPaths(QStringList() << searchPath);
QString themeName("testtheme");
QIcon::setThemeName(themeName);
QIcon icon = QIcon::fromTheme("appointment-new");
QString name = icon.name();
QCOMPARE(name, QLatin1String("appointment-new"));
}
}
void tst_QIcon::streamAvailableSizes_data()
{
QTest::addColumn<QIcon>("icon");
QIcon icon;
icon.addFile(":/image.png", QSize(32,32));
QTest::newRow( "32x32" ) << icon;
icon.addFile(":/image.png", QSize(64,64));
QTest::newRow( "64x64" ) << icon;
icon.addFile(":/image.png", QSize(128,128));
QTest::newRow( "128x128" ) << icon;
icon.addFile(":/image.png", QSize(256,256));
QTest::newRow( "256x256" ) << icon;
}
void tst_QIcon::streamAvailableSizes()
{
QFETCH(QIcon, icon);
QByteArray ba;
// write to QByteArray
{
QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly);
QDataStream stream(&buffer);
stream << icon;
}
// read from QByteArray
{
QBuffer buffer(&ba);
buffer.open(QIODevice::ReadOnly);
QDataStream stream(&buffer);
QIcon i;
stream >> i;
QCOMPARE(i.isNull(), icon.isNull());
QCOMPARE(i.availableSizes(), icon.availableSizes());
}
}
Make qicon autotest build without widgets Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-05 11:35:14 +00:00
#ifndef QT_NO_WIDGETS
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void tst_QIcon::task184901_badCache()
{
tst_qicon: Resolve all files using QFINDTESTDATA(). The local files in availableSizes() were not resolved. Introduce member variables for the file names, resolve them in the constructor and add initTestCase() to verify. Task-number: QTBUG-39287 Change-Id: If841e904700fe76b6c9265124ccba7764911fdc9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-06-20 10:28:23 +00:00
QPixmap pm(m_pngImageFileName);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QIcon icon(pm);
//the disabled icon must have an effect (grayed)
QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() != icon.pixmap(32, QIcon::Disabled).toImage());
icon.addPixmap(pm, QIcon::Disabled);
//the disabled icon must now be the same as the normal one.
QVERIFY( icon.pixmap(32, QIcon::Normal).toImage() == icon.pixmap(32, QIcon::Disabled).toImage() );
}
Make qicon autotest build without widgets Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-05 11:35:14 +00:00
#endif
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void tst_QIcon::fromTheme()
{
QIcon: use fallback also with platform icon engine Amends a452e2254644ffbed289fdf051eaf41d7e6a3b0d. No new tests, existing tests fails when QPlatformTheme returns a QIconEngine implementation that provides the tested icons. However, the existing test fails when the platform icon engine provides and address-book-new icon, and depends on the order of test functions, as the name() test function modifies the global theme name and search path. Fix those issues in the test. Pick-to: 6.6 Change-Id: Ie1c1d14f08fad5e906296bab662df5cfacdbbf07 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-07-13 13:24:35 +00:00
const bool abIconFromPlatform = !QIcon::fromTheme("address-book-new").isNull();
Fixed icons lookup in QIcon::fromTheme This commit fixes incorrect logic of icons' lookup if there are fallbacks or more than one theme's directory. According to Icon Theme Specification, Directory Layout section, theme can be spread across several base directories by having subdirectories of the same name. This makes possible to extend system themes by application-specific icons without making of collisions with other applications. According to Icon Naming Specification, Icon Naming Guidelines section, icon name may contain dashes to separate levels of specificity in icon names. This makes possible to set in application very specific icon which may be not in every theme. So it can fallback to less specific one. Change-Id: Iafc813902a3646be56e8f1d3a2fdbf8fd32ac542 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2014-03-30 23:54:06 +00:00
QString firstSearchPath = QLatin1String(":/icons");
QString secondSearchPath = QLatin1String(":/second_icons");
QIcon::setThemeSearchPaths(QStringList() << firstSearchPath << secondSearchPath);
tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I624deb320c378c18a29b3707f48583d53bfd5186 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-07-30 13:15:12 +00:00
QCOMPARE(QIcon::themeSearchPaths().size(), 2);
Fixed icons lookup in QIcon::fromTheme This commit fixes incorrect logic of icons' lookup if there are fallbacks or more than one theme's directory. According to Icon Theme Specification, Directory Layout section, theme can be spread across several base directories by having subdirectories of the same name. This makes possible to extend system themes by application-specific icons without making of collisions with other applications. According to Icon Naming Specification, Icon Naming Guidelines section, icon name may contain dashes to separate levels of specificity in icon names. This makes possible to set in application very specific icon which may be not in every theme. So it can fallback to less specific one. Change-Id: Iafc813902a3646be56e8f1d3a2fdbf8fd32ac542 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2014-03-30 23:54:06 +00:00
QCOMPARE(firstSearchPath, QIcon::themeSearchPaths()[0]);
QCOMPARE(secondSearchPath, QIcon::themeSearchPaths()[1]);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Introduce QIcon::fallbackSearchPaths() ... that will be used if an icon can't be found in the current theme. The Icon Theme Specification https://standards.freedesktop.org/icon-theme-spec/latest/ar01s05.html states that unthemed icons must be searched in the base directories, i.e. /usr/share/icons, ... But in practice unthemed icons are installed into /usr/share/pixmaps and this dir is not used as a base dir for icon themes. So it's better to explicitly specify fallback dirs to avoid needless access to the filesystem. Also some KDE application install their own unthemed icons (into /usr/share/<appname>/pics), that can't be found by QIconLoader. With this change it would be possible for them to specify dirs with unthemed icons and thus be displayed correctly in non-KDE environments. [ChangeLog][QtGui][QIcon] Added fallbackSearchPaths() that will be used to find icons missing in the current icon theme. Change-Id: I0dc55ba958b29356a3b0a2123d6b8faa24d4c91e Task-number: QTBUG-33123 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2017-12-20 13:03:42 +00:00
QString fallbackSearchPath = QStringLiteral(":/fallback_icons");
QIcon::setFallbackSearchPaths(QStringList() << fallbackSearchPath);
QCOMPARE(QIcon::fallbackSearchPaths().size(), 1);
QCOMPARE(fallbackSearchPath, QIcon::fallbackSearchPaths().at(0));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString themeName("testtheme");
QIcon::setThemeName(themeName);
QCOMPARE(QIcon::themeName(), themeName);
// Test normal icon
QIcon appointmentIcon = QIcon::fromTheme("appointment-new");
QVERIFY(!appointmentIcon.isNull());
QVERIFY(!appointmentIcon.availableSizes(QIcon::Normal, QIcon::Off).isEmpty());
QVERIFY(appointmentIcon.availableSizes().contains(QSize(16, 16)));
QVERIFY(appointmentIcon.availableSizes().contains(QSize(32, 32)));
QVERIFY(appointmentIcon.availableSizes().contains(QSize(22, 22)));
Fixed icons lookup in QIcon::fromTheme This commit fixes incorrect logic of icons' lookup if there are fallbacks or more than one theme's directory. According to Icon Theme Specification, Directory Layout section, theme can be spread across several base directories by having subdirectories of the same name. This makes possible to extend system themes by application-specific icons without making of collisions with other applications. According to Icon Naming Specification, Icon Naming Guidelines section, icon name may contain dashes to separate levels of specificity in icon names. This makes possible to set in application very specific icon which may be not in every theme. So it can fallback to less specific one. Change-Id: Iafc813902a3646be56e8f1d3a2fdbf8fd32ac542 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2014-03-30 23:54:06 +00:00
// Test fallback to less specific icon
QIcon specificAppointmentIcon = QIcon::fromTheme("appointment-new-specific");
QVERIFY(!QIcon::hasThemeIcon("appointment-new-specific"));
QVERIFY(QIcon::hasThemeIcon("appointment-new"));
QCOMPARE(specificAppointmentIcon.name(), QString::fromLatin1("appointment-new"));
QCOMPARE(specificAppointmentIcon.availableSizes(), appointmentIcon.availableSizes());
QCOMPARE(specificAppointmentIcon.pixmap(32).cacheKey(), appointmentIcon.pixmap(32).cacheKey());
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Test icon from parent theme
QIcon abIcon = QIcon::fromTheme("address-book-new");
QVERIFY(!abIcon.isNull());
QVERIFY(QIcon::hasThemeIcon("address-book-new"));
QVERIFY(!abIcon.availableSizes().isEmpty());
Introduce QIcon::fallbackSearchPaths() ... that will be used if an icon can't be found in the current theme. The Icon Theme Specification https://standards.freedesktop.org/icon-theme-spec/latest/ar01s05.html states that unthemed icons must be searched in the base directories, i.e. /usr/share/icons, ... But in practice unthemed icons are installed into /usr/share/pixmaps and this dir is not used as a base dir for icon themes. So it's better to explicitly specify fallback dirs to avoid needless access to the filesystem. Also some KDE application install their own unthemed icons (into /usr/share/<appname>/pics), that can't be found by QIconLoader. With this change it would be possible for them to specify dirs with unthemed icons and thus be displayed correctly in non-KDE environments. [ChangeLog][QtGui][QIcon] Added fallbackSearchPaths() that will be used to find icons missing in the current icon theme. Change-Id: I0dc55ba958b29356a3b0a2123d6b8faa24d4c91e Task-number: QTBUG-33123 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2017-12-20 13:03:42 +00:00
// Test icon from fallback path
QIcon fallbackIcon = QIcon::fromTheme("red");
QVERIFY(!fallbackIcon.isNull());
QVERIFY(QIcon::hasThemeIcon("red"));
QCOMPARE(fallbackIcon.availableSizes().size(), 1);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Test non existing icon
QIcon noIcon = QIcon::fromTheme("broken-icon");
QVERIFY(noIcon.isNull());
QVERIFY(!QIcon::hasThemeIcon("broken-icon"));
QIconLoaderEngine: Fix actualSize() for no-entry Return an empty size if no suitable entry found to avoid mismatch with the returned pixmap()'s size (the QIconEngine::actualSize() returns the originally requested size). Change-Id: Ia278719a54392b62c5f9fc0529476baba5cd7df0 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2017-04-27 08:03:53 +00:00
QCOMPARE(noIcon.actualSize(QSize(32, 32), QIcon::Normal, QIcon::On), QSize(0, 0));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Test non existing icon with fallback
noIcon = QIcon::fromTheme("broken-icon", abIcon);
tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I624deb320c378c18a29b3707f48583d53bfd5186 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-07-30 13:15:12 +00:00
QCOMPARE(noIcon.cacheKey(), abIcon.cacheKey());
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Test svg-only icon
noIcon = QIcon::fromTheme("svg-icon", abIcon);
QVERIFY(!noIcon.availableSizes().isEmpty());
Establish baseline for QIcon test on dpr > 1 After enabling Qt::AA_UseHighDpiPixmaps, QIcon::pixmap() now returns pixmaps larger than the requested size on devicePixelRatio > 1 screens. Adapt tests to account for this changed behavior. Skip tests where it’s unclear what the the expected behavior is, or where the test logic does not apply to dpr > 1. This gives a clearer indication of where we are (39 passed, 0 failed, 9 skipped), and enables using the qicon test to catch regressions also when running at dpr > 1. Remove the "lowdpi" testcase flags from the qmake and cmake project files. Change-Id: Ia7ce722ae356fc496a91b54e9f5d590d13b9df62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-29 21:35:47 +00:00
// Pixmaps should be no larger than the requested size (for devicePixelRatio 1) (QTBUG-17953)
if (qApp->devicePixelRatio() == 1) {
QCOMPARE(appointmentIcon.pixmap(22).size(), QSize(22, 22)); // exact
QCOMPARE(appointmentIcon.pixmap(32).size(), QSize(32, 32)); // exact
QCOMPARE(appointmentIcon.pixmap(48).size(), QSize(32, 32)); // smaller
QCOMPARE(appointmentIcon.pixmap(16).size(), QSize(16, 16)); // scaled down
QCOMPARE(appointmentIcon.pixmap(8).size(), QSize(8, 8)); // scaled down
QCOMPARE(appointmentIcon.pixmap(16).size(), QSize(16, 16)); // scaled down
}
Scale icons returned by QIcon::fromTheme. The icon engine behind icons that are loaded from QIcon::fromTheme does not scale any pixmaps that it returns. When using an icon theme with an incomplete set of icons (for example, only a "128x128" folder), QIcon::pixmap will always return 128x128 pixmaps even if you ask for one of size 22x22. This is contrary to the QIcon::pixmap documentation that says "The pixmap might be smaller than requested, but never larger." This patch uses the same code that is in the main QIcon class in the PixmapEntry QIconLoaderEngineEntry to scale pixmaps if they are too big. Change-Id: Ic25a3628ac82cfb899574245f658490a2dd49d54 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-03-22 11:28:29 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QByteArray ba;
// write to QByteArray
{
QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly);
QDataStream stream(&buffer);
stream << abIcon;
}
// read from QByteArray
{
QBuffer buffer(&ba);
buffer.open(QIODevice::ReadOnly);
QDataStream stream(&buffer);
QIcon i;
stream >> i;
QCOMPARE(i.isNull(), abIcon.isNull());
QCOMPARE(i.availableSizes(), abIcon.availableSizes());
}
Invalidate QIconLoader cache when setting fallback theme Setting a fallback theme will affect the lookup strategy, so we need to invalidate earlier lookups. Pick-to: 6.5 6.6 Change-Id: I962245ddb3a20b7798d5ce831ed8a369b0ab76b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-05-11 13:31:22 +00:00
// Check that setting a fallback theme invalidates earlier lookups
QVERIFY(QIcon::fromTheme("edit-cut").isNull());
QIcon::setFallbackThemeName("fallbacktheme");
QVERIFY(!QIcon::fromTheme("edit-cut").isNull());
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Make sure setting the theme name clears the state
QIcon::setThemeName("");
abIcon = QIcon::fromTheme("address-book-new");
QIcon: use fallback also with platform icon engine Amends a452e2254644ffbed289fdf051eaf41d7e6a3b0d. No new tests, existing tests fails when QPlatformTheme returns a QIconEngine implementation that provides the tested icons. However, the existing test fails when the platform icon engine provides and address-book-new icon, and depends on the order of test functions, as the name() test function modifies the global theme name and search path. Fix those issues in the test. Pick-to: 6.6 Change-Id: Ie1c1d14f08fad5e906296bab662df5cfacdbbf07 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-07-13 13:24:35 +00:00
QCOMPARE_NE(abIcon.isNull(), abIconFromPlatform);
QIcon::fromTheme(): add support for absolute paths. This allows methods that return an icon name, to sometimes also return an icon full path (e.g. because the icon was dynamically generated and stored into a local cache on disk) Change-Id: Ib01c3955f4b64236463846241d9814b2d0686634 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-02-05 11:22:26 +00:00
Consult QIcon::fallbackSearchPaths() even when theme name is empty The use of fallback icons should not depend on a theme being set. [ChangeLog][QtGui][QIcon] QIcon::fallbackSearchPaths() will now be consulted for fallback icons even if the current theme name is empty. Pick-to: 6.5 6.6 Change-Id: Ia8d14062de7c53601fd9dac30f87a9e672aa2207 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-05-10 16:27:27 +00:00
// Test fallback icon behavior for empty theme names.
// Can only reliably test this on systems that don't have a
// named system icon theme.
QIcon::setThemeName(""); // Reset user-theme
if (QIcon::themeName().isEmpty()) {
Consult QIcon::fallbackThemeName() even when theme name is empty We still need to consult fallbackThemeName() when computing the parent list for an individual theme, as the Freedesktop Theme Icon spec mandates that the "hicolor" theme comes last, but we no longer need to do explicit fallback to fallbackThemeName() if a theme is not found. Pick-to: 6.5 6.6 Change-Id: I6c0b5a45d8258c5b6eaa761402944a735b1606ba Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-05-10 16:46:22 +00:00
// Test icon from fallback theme even when theme name is empty
QIcon::setFallbackThemeName("fallbacktheme");
QVERIFY(!QIcon::fromTheme("edit-cut").isNull());
Consult QIcon::fallbackSearchPaths() even when theme name is empty The use of fallback icons should not depend on a theme being set. [ChangeLog][QtGui][QIcon] QIcon::fallbackSearchPaths() will now be consulted for fallback icons even if the current theme name is empty. Pick-to: 6.5 6.6 Change-Id: Ia8d14062de7c53601fd9dac30f87a9e672aa2207 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-05-10 16:27:27 +00:00
// Test icon from fallback path even when theme name is empty
fallbackIcon = QIcon::fromTheme("red");
QVERIFY(!fallbackIcon.isNull());
QVERIFY(QIcon::hasThemeIcon("red"));
QCOMPARE(fallbackIcon.availableSizes().size(), 1);
}
QIcon::fromTheme(): add support for absolute paths. This allows methods that return an icon name, to sometimes also return an icon full path (e.g. because the icon was dynamically generated and stored into a local cache on disk) Change-Id: Ib01c3955f4b64236463846241d9814b2d0686634 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-02-05 11:22:26 +00:00
// Passing a full path to fromTheme is not very useful, but should work anyway
QIcon fullPathIcon = QIcon::fromTheme(m_pngImageFileName);
QVERIFY(!fullPathIcon.isNull());
Invalidate QIconLoader cache when setting fallback theme Setting a fallback theme will affect the lookup strategy, so we need to invalidate earlier lookups. Pick-to: 6.5 6.6 Change-Id: I962245ddb3a20b7798d5ce831ed8a369b0ab76b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-05-11 13:31:22 +00:00
// Restore to system fallback theme
QIcon::setFallbackThemeName("");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
Fix test tst_QIcon::fromThemeCache(). Verify that the temporary directory could be created. Check whether the gtk-update-icon-cache binary exists before running and skip cleanly. Check successful execution. Fixes Windows warnings: SKIP : tst_QIcon::fromThemeCache() gtk-update-icon-cache not run .\tst_qicon.cpp(707) : failure location QWARN : tst_QIcon::fromThemeCache() QTemporaryDir: Unable to remove "D:\\temp\\tst_qicon-DSSn9G" most likely due to the presence of read-only files. Change-Id: Ibc8f883121e62b30d71586bc64b42eb6c480925f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-01 12:47:04 +00:00
static inline QString findGtkUpdateIconCache()
{
QString binary = QLatin1String("gtk-update-icon-cache");
#ifdef Q_OS_WIN
binary += QLatin1String(".exe");
#endif
return QStandardPaths::findExecutable(binary);
}
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
void tst_QIcon::fromThemeCache()
{
QTemporaryDir dir;
Fix test tst_QIcon::fromThemeCache(). Verify that the temporary directory could be created. Check whether the gtk-update-icon-cache binary exists before running and skip cleanly. Check successful execution. Fixes Windows warnings: SKIP : tst_QIcon::fromThemeCache() gtk-update-icon-cache not run .\tst_qicon.cpp(707) : failure location QWARN : tst_QIcon::fromThemeCache() QTemporaryDir: Unable to remove "D:\\temp\\tst_qicon-DSSn9G" most likely due to the presence of read-only files. Change-Id: Ibc8f883121e62b30d71586bc64b42eb6c480925f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-01 12:47:04 +00:00
QVERIFY2(dir.isValid(), qPrintable(dir.errorString()));
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
QVERIFY(QDir().mkpath(dir.path() + QLatin1String("/testcache/16x16/actions")));
QVERIFY(QFile(QStringLiteral(":/styles/commonstyle/images/standardbutton-open-16.png"))
.copy( dir.path() + QLatin1String("/testcache/16x16/actions/button-open.png")));
{
QFile index(dir.path() + QLatin1String("/testcache/index.theme"));
QVERIFY(index.open(QFile::WriteOnly));
index.write("[Icon Theme]\nDirectories=16x16/actions\n[16x16/actions]\nSize=16\nContext=Actions\nType=Fixed\n");
}
QIcon::setThemeSearchPaths(QStringList() << dir.path());
QIcon::setThemeName("testcache");
// We just created a theme with that icon, it must exist
QVERIFY(!QIcon::fromTheme("button-open").isNull());
QString cacheName = dir.path() + QLatin1String("/testcache/icon-theme.cache");
// An invalid cache should not prevent lookup
{
QFile cacheFile(cacheName);
QVERIFY(cacheFile.open(QFile::WriteOnly));
QDataStream(&cacheFile) << quint16(1) << quint16(0) << "invalid corrupted stuff in there\n";
}
QIcon::setThemeSearchPaths(QStringList() << dir.path()); // reload themes
QVERIFY(!QIcon::fromTheme("button-open").isNull());
// An empty cache should prevent the lookup
{
QFile cacheFile(cacheName);
QVERIFY(cacheFile.open(QFile::WriteOnly));
QDataStream ds(&cacheFile);
ds << quint16(1) << quint16(0); // 0: version
ds << quint32(12) << quint32(20); // 4: hash offset / dir list offset
ds << quint32(1) << quint32(0xffffffff); // 12: one empty bucket
ds << quint32(1) << quint32(28); // 20: list with one element
ds.writeRawData("16x16/actions", sizeof("16x16/actions")); // 28
}
QIcon::setThemeSearchPaths(QStringList() << dir.path()); // reload themes
QVERIFY(QIcon::fromTheme("button-open").isNull()); // The icon was not in the cache, it should not be found
// Adding an icon should be changing the modification date of one sub directory which should make the cache ignored
QTest::qWait(1000); // wait enough to have a different modification time in seconds
QVERIFY(QFile(QStringLiteral(":/styles/commonstyle/images/standardbutton-save-16.png"))
.copy(dir.path() + QLatin1String("/testcache/16x16/actions/button-save.png")));
Use QFileInfo's file times in UTC for file timestamps This is inherently faster than getting it in UTC from the underlying native API stat call, then converting it to the Local Time Zone just to compare them. The same goes for any use-case where you get a QDateTime then the first thing you do is call t.to{Msec,Secs}SinceEpoch(). Change-Id: Ic13bcfd99b937c9f10f102ea7741832950a553c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-12-17 11:09:33 +00:00
QVERIFY(QFileInfo(cacheName).lastModified(QTimeZone::UTC) < QFileInfo(dir.path() + QLatin1String("/testcache/16x16/actions")).lastModified(QTimeZone::UTC));
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
QIcon::setThemeSearchPaths(QStringList() << dir.path()); // reload themes
QVERIFY(!QIcon::fromTheme("button-open").isNull());
// Try to run the actual gtk-update-icon-cache and make sure that icons are still found
Fix test tst_QIcon::fromThemeCache(). Verify that the temporary directory could be created. Check whether the gtk-update-icon-cache binary exists before running and skip cleanly. Check successful execution. Fixes Windows warnings: SKIP : tst_QIcon::fromThemeCache() gtk-update-icon-cache not run .\tst_qicon.cpp(707) : failure location QWARN : tst_QIcon::fromThemeCache() QTemporaryDir: Unable to remove "D:\\temp\\tst_qicon-DSSn9G" most likely due to the presence of read-only files. Change-Id: Ibc8f883121e62b30d71586bc64b42eb6c480925f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-01 12:47:04 +00:00
const QString gtkUpdateIconCache = findGtkUpdateIconCache();
if (gtkUpdateIconCache.isEmpty()) {
QIcon::setThemeSearchPaths(QStringList());
QSKIP("gtk-update-icon-cache not run (binary not found)");
}
Properly use the "process" feature Replace all QT_NO_PROCESS with QT_CONFIG(process), define it in qconfig-bootstrapped.h, add QT_REQUIRE_CONFIG(process) to the qprocess headers, exclude the sources from compilation when switched off, guard header inclusions in places where compilation without QProcess seems supported, drop some unused includes, and fix some tests that were apparently designed to work with QT_NO_PROCESS but failed to. Change-Id: Ieceea2504dea6fdf43b81c7c6b65c547b01b9714 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-11-23 11:25:17 +00:00
#if QT_CONFIG(process)
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
QProcess process;
Fix test tst_QIcon::fromThemeCache(). Verify that the temporary directory could be created. Check whether the gtk-update-icon-cache binary exists before running and skip cleanly. Check successful execution. Fixes Windows warnings: SKIP : tst_QIcon::fromThemeCache() gtk-update-icon-cache not run .\tst_qicon.cpp(707) : failure location QWARN : tst_QIcon::fromThemeCache() QTemporaryDir: Unable to remove "D:\\temp\\tst_qicon-DSSn9G" most likely due to the presence of read-only files. Change-Id: Ibc8f883121e62b30d71586bc64b42eb6c480925f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-01 12:47:04 +00:00
process.start(gtkUpdateIconCache,
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
QStringList() << QStringLiteral("-f") << QStringLiteral("-t") << (dir.path() + QLatin1String("/testcache")));
Fix test tst_QIcon::fromThemeCache(). Verify that the temporary directory could be created. Check whether the gtk-update-icon-cache binary exists before running and skip cleanly. Check successful execution. Fixes Windows warnings: SKIP : tst_QIcon::fromThemeCache() gtk-update-icon-cache not run .\tst_qicon.cpp(707) : failure location QWARN : tst_QIcon::fromThemeCache() QTemporaryDir: Unable to remove "D:\\temp\\tst_qicon-DSSn9G" most likely due to the presence of read-only files. Change-Id: Ibc8f883121e62b30d71586bc64b42eb6c480925f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-01 12:47:04 +00:00
QVERIFY2(process.waitForStarted(), qPrintable(QLatin1String("Unable to start: ")
+ gtkUpdateIconCache + QLatin1String(": ")
+ process.errorString()));
QVERIFY(process.waitForFinished());
QCOMPARE(process.exitStatus(), QProcess::NormalExit);
QCOMPARE(process.exitCode(), 0);
Properly use the "process" feature Replace all QT_NO_PROCESS with QT_CONFIG(process), define it in qconfig-bootstrapped.h, add QT_REQUIRE_CONFIG(process) to the qprocess headers, exclude the sources from compilation when switched off, guard header inclusions in places where compilation without QProcess seems supported, drop some unused includes, and fix some tests that were apparently designed to work with QT_NO_PROCESS but failed to. Change-Id: Ieceea2504dea6fdf43b81c7c6b65c547b01b9714 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-11-23 11:25:17 +00:00
#endif // QT_CONFIG(process)
Use QFileInfo's file times in UTC for file timestamps This is inherently faster than getting it in UTC from the underlying native API stat call, then converting it to the Local Time Zone just to compare them. The same goes for any use-case where you get a QDateTime then the first thing you do is call t.to{Msec,Secs}SinceEpoch(). Change-Id: Ic13bcfd99b937c9f10f102ea7741832950a553c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-12-17 11:09:33 +00:00
QVERIFY(QFileInfo(cacheName).lastModified(QTimeZone::UTC) >= QFileInfo(dir.path() + QLatin1String("/testcache/16x16/actions")).lastModified(QTimeZone::UTC));
QIconLoader: Use the GTK+ icon caches Loading icons is quite slow because we need to stat many files in many directories. That's why gtk adds a cache in the icon theme directory so it avoids stating lots of files. The cache file can be generated with gtk-update-icon-cache utility on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run. [ChangeLog][QtGui][QIcon] fromTheme gained the ability to use the GTK icon cache to speed up lookups. Change-Id: I3ab8a9910be67a34034556023be61a86789a7893 Reviewed-by: David Faure <david.faure@kdab.com>
2015-09-08 15:22:01 +00:00
QIcon::setThemeSearchPaths(QStringList() << dir.path()); // reload themes
QVERIFY(!QIcon::fromTheme("button-open").isNull());
QVERIFY(!QIcon::fromTheme("button-open-fallback").isNull());
QVERIFY(QIcon::fromTheme("notexist-fallback").isNull());
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void tst_QIcon::task223279_inconsistentAddFile()
{
QIcon icon1;
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
icon1.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32));
QPixmap pm1 = icon1.pixmap(32, 32);
QIcon icon2;
tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 12:10:17 +00:00
icon2.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
icon2.addFile(QLatin1String("IconThatDoesntExist"));
QPixmap pm2 = icon1.pixmap(32, 32);
QCOMPARE(pm1.isNull(), false);
QCOMPARE(pm1.size(), QSize(16,16));
QCOMPARE(pm1.isNull(), pm2.isNull());
QCOMPARE(pm1.size(), pm2.size());
}
QTEST_MAIN(tst_QIcon)
#include "tst_qicon.moc"
Reference in New Issue Copy Permalink