From 4a9aaa11235f16fb3525eab4f38a2089137382dd Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 3 Apr 2023 17:30:40 +0200 Subject: [PATCH] Revert "Add auto tests for color filter bug" This reverts commit c41e5c431d8c53ba03f3ed6f221411855e6f690b. Uwe doesn't want them. --- features/qskautotest.prf | 10 ------ features/qskconfig.pri | 1 - qskinny.pro | 4 +-- tests/graphic/graphic.pro | 3 -- .../graphic/qskcolorfilter/qskcolorfilter.pro | 4 --- .../qskcolorfilter/testQskColorFilter.cpp | 33 ------------------- tests/tests.pro | 3 -- 7 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 features/qskautotest.prf delete mode 100644 tests/graphic/graphic.pro delete mode 100644 tests/graphic/qskcolorfilter/qskcolorfilter.pro delete mode 100644 tests/graphic/qskcolorfilter/testQskColorFilter.cpp delete mode 100644 tests/tests.pro diff --git a/features/qskautotest.prf b/features/qskautotest.prf deleted file mode 100644 index 5e7a2e87..00000000 --- a/features/qskautotest.prf +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app -CONFIG += qskinny qsktestsupport testcase - -QT += testlib - -DEFINES += QSK_DLL -DESTDIR = $$clean_path( $${OUT_PWD}/../bin ) - -target.path = $${QSK_INSTALL_AUTOTESTS}/bin -INSTALLS = target diff --git a/features/qskconfig.pri b/features/qskconfig.pri index df8d0479..1b3f20fb 100644 --- a/features/qskconfig.pri +++ b/features/qskconfig.pri @@ -31,7 +31,6 @@ QSK_INSTALL_LIBS = $${QSK_INSTALL_PREFIX}/lib QSK_INSTALL_BINS = $${QSK_INSTALL_PREFIX}/bin QSK_INSTALL_PLUGINS = $${QSK_INSTALL_PREFIX}/plugins QSK_INSTALL_EXAMPLES = $${QSK_INSTALL_PREFIX}/examples -QSK_INSTALL_AUTOTESTS = $${QSK_INSTALL_PREFIX}/tests CONFIG += no_private_qt_headers_warning diff --git a/qskinny.pro b/qskinny.pro index f1cca581..7a41eef1 100644 --- a/qskinny.pro +++ b/qskinny.pro @@ -8,8 +8,7 @@ SUBDIRS = \ tools \ support \ examples \ - playground \ - tests + playground OTHER_FILES = \ doc/Doxyfile \ @@ -26,4 +25,3 @@ tools.depends = src support.depends = src skins examples.depends = tools support skins qmlexport playground.depends = tools support skins qmlexport -tests.depends = support diff --git a/tests/graphic/graphic.pro b/tests/graphic/graphic.pro deleted file mode 100644 index 11cbf9fd..00000000 --- a/tests/graphic/graphic.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - qskcolorfilter \ diff --git a/tests/graphic/qskcolorfilter/qskcolorfilter.pro b/tests/graphic/qskcolorfilter/qskcolorfilter.pro deleted file mode 100644 index faff39aa..00000000 --- a/tests/graphic/qskcolorfilter/qskcolorfilter.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += qskautotest - -TARGET = testQskColorFilter -SOURCES += testQskColorFilter.cpp diff --git a/tests/graphic/qskcolorfilter/testQskColorFilter.cpp b/tests/graphic/qskcolorfilter/testQskColorFilter.cpp deleted file mode 100644 index 308a8175..00000000 --- a/tests/graphic/qskcolorfilter/testQskColorFilter.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include - -#include -#include - -class TestQskColorFilter : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void substituteBrush(); -}; - -void TestQskColorFilter::substituteBrush() -{ - QskColorFilter filter; - filter.addColorSubstitution( Qt::white, Qt::black ); - - QLinearGradient gradient; - QGradientStops originalStops( { { 0.0, Qt::white }, { 1.0, Qt::blue } } ); - gradient.setStops( originalStops ); - - QBrush originalBrush( gradient ); - - auto newBrush = filter.substituted( originalBrush ); - QGradientStops newStops( { { 0.0, Qt::black }, { 1.0, Qt::blue } } ); - - QVERIFY( originalBrush.gradient()->stops() == originalStops ); - QVERIFY( newBrush.gradient()->stops() == newStops ); -} - -QTEST_GUILESS_MAIN( TestQskColorFilter ) -#include "testQskColorFilter.moc" diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index fdca9e1c..00000000 --- a/tests/tests.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - graphic \