Commit be939e0a authored by Halla Rempt's avatar Halla Rempt
Browse files

Port away from qtest_kde.h to QTest

parent a83fe323
......@@ -49,20 +49,20 @@ calligra_add_benchmark(KisLowMemoryBenchmark TESTNAME krita-benchmarks-KisLowMem
calligra_add_benchmark(KisFilterSelectionsBenchmark TESTNAME krita-image-KisFilterSelectionsBenchmark ${kis_filter_selections_benchmark_SRCS})
calligra_add_benchmark(KisCompositionBenchmark TESTNAME krita-benchmarks-KisComposition ${kis_composition_benchmark_SRCS})
target_link_libraries(KisDatamanagerBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisHLineIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisVLineIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisRandomIteratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisProjectionBenchmark kritaimage KF5::KDELibs4Support kritaui Qt5::Test)
target_link_libraries(KisBContrastBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisBlurBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisLevelFilterBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisPainterBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisStrokeBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFastMathBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFloodfillBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisGradientBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisLowMemoryBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisFilterSelectionsBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisCompositionBenchmark kritaimage KF5::KDELibs4Support Qt5::Test ${LINK_VC_LIB})
target_link_libraries(KisMaskGeneratorBenchmark kritaimage KF5::KDELibs4Support Qt5::Test)
target_link_libraries(KisDatamanagerBenchmark kritaimage Qt5::Test)
target_link_libraries(KisHLineIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisVLineIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisRandomIteratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisProjectionBenchmark kritaimage kritaui Qt5::Test)
target_link_libraries(KisBContrastBenchmark kritaimage Qt5::Test)
target_link_libraries(KisBlurBenchmark kritaimage Qt5::Test)
target_link_libraries(KisLevelFilterBenchmark kritaimage Qt5::Test)
target_link_libraries(KisPainterBenchmark kritaimage Qt5::Test)
target_link_libraries(KisStrokeBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFastMathBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFloodfillBenchmark kritaimage Qt5::Test)
target_link_libraries(KisGradientBenchmark kritaimage Qt5::Test)
target_link_libraries(KisLowMemoryBenchmark kritaimage Qt5::Test)
target_link_libraries(KisFilterSelectionsBenchmark kritaimage Qt5::Test)
target_link_libraries(KisCompositionBenchmark kritaimage Qt5::Test ${LINK_VC_LIB})
target_link_libraries(KisMaskGeneratorBenchmark kritaimage Qt5::Test)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_bcontrast_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -96,4 +96,4 @@ void KisBContrastBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisBContrastBenchmark, GUI)
QTEST_MAIN(KisBContrastBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_blur_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -88,4 +88,4 @@ void KisBlurBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisBlurBenchmark, GUI)
QTEST_MAIN(KisBlurBenchmark)
......@@ -19,7 +19,7 @@
#include "kis_composition_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpace.h>
#include <KoCompositeOp.h>
......@@ -859,5 +859,5 @@ void KisCompositionBenchmark::benchmarkFloatIntUint()
#endif
}
QTEST_KDEMAIN(KisCompositionBenchmark, GUI)
QTEST_MAIN(KisCompositionBenchmark)
......@@ -19,7 +19,7 @@
#include "kis_datamanager_benchmark.h"
#include "kis_benchmark_values.h"
#include <qtest_kde.h>
#include <QTest>
#include <kis_datamanager.h>
// RGBA
......@@ -199,4 +199,4 @@ void KisDatamanagerBenchmark::benchmarkMemCpy()
}
QTEST_KDEMAIN(KisDatamanagerBenchmark, GUI)
QTEST_MAIN(KisDatamanagerBenchmark)
......@@ -18,7 +18,7 @@
#include "kis_fast_math_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include <kis_fast_math.h>
......@@ -54,5 +54,5 @@ void KisFastMathBenchmark::benchmarkLibCAtan2()
}
}
QTEST_KDEMAIN(KisFastMathBenchmark, GUI)
QTEST_MAIN(KisFastMathBenchmark)
......@@ -20,7 +20,7 @@
#include "kis_painter.h"
#include <qtest_kde.h>
#include <QTest>
#include "testutil.h"
#include "kis_selection.h"
#include "kis_transaction.h"
......@@ -291,4 +291,4 @@ void KisFilterSelectionsBenchmark::testBitBltSelections(int num)
dbgKrita << "bitBlt with sel:\t\t\t" << avTime;
}
QTEST_KDEMAIN(KisFilterSelectionsBenchmark, GUI)
QTEST_MAIN(KisFilterSelectionsBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <kundo2command.h>
#include "kis_benchmark_values.h"
......@@ -111,4 +111,4 @@ void KisFloodFillBenchmark::cleanupTestCase()
}
QTEST_KDEMAIN(KisFloodFillBenchmark, NoGUI)
QTEST_MAIN(KisFloodFillBenchmark)
......@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <kundo2command.h>
#include "kis_benchmark_values.h"
......@@ -89,4 +89,4 @@ void KisGradientBenchmark::cleanupTestCase()
}
QTEST_KDEMAIN(KisGradientBenchmark, NoGUI)
QTEST_MAIN(KisGradientBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <qtest_kde.h>
#include <QTest>
#include "kis_iterator_ng.h"
......@@ -191,4 +191,4 @@ void KisHLineIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy(){
QTEST_KDEMAIN(KisHLineIteratorBenchmark, GUI)
QTEST_MAIN(KisHLineIteratorBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_level_filter_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -101,4 +101,4 @@ void KisLevelFilterBenchmark::benchmarkFilter()
QTEST_KDEMAIN(KisLevelFilterBenchmark, GUI)
QTEST_MAIN(KisLevelFilterBenchmark)
......@@ -18,7 +18,7 @@
#include "kis_low_memory_benchmark.h"
#include <qtest_kde.h>
#include <QTest>
#include "kis_benchmark_values.h"
......@@ -228,4 +228,4 @@ void KisLowMemoryBenchmark::memory2000History100Pool500HugeBrush()
2000, 600, 500, 0);
}
QTEST_KDEMAIN(KisLowMemoryBenchmark, GUI)
QTEST_MAIN(KisLowMemoryBenchmark)
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include <config-vc.h>
#ifdef HAVE_VC
......@@ -75,4 +75,4 @@ void KisMaskGeneratorBenchmark::benchmarkSquare()
}
}
QTEST_KDEMAIN(KisMaskGeneratorBenchmark, GUI)
QTEST_MAIN(KisMaskGeneratorBenchmark)
......@@ -25,7 +25,7 @@ inline double drand48()
}
#endif
#include <qtest_kde.h>
#include <QTest>
#include <QImage>
#include <kis_debug.h>
......@@ -275,4 +275,4 @@ void KisPainterBenchmark::benchmarkDrawScanLine()
#endif
}
QTEST_KDEMAIN(KisPainterBenchmark, NoGUI)
QTEST_MAIN(KisPainterBenchmark)
......@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <qtest_kde.h>
#include <QTest>
#include "kis_projection_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -59,4 +59,4 @@ void KisProjectionBenchmark::benchmarkLoading()
}
QTEST_KDEMAIN(KisProjectionBenchmark, GUI)
QTEST_MAIN(KisProjectionBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <qtest_kde.h>
#include <QTest>
#include <kis_random_accessor_ng.h>
......@@ -235,4 +235,4 @@ void KisRandomIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()
}
QTEST_KDEMAIN(KisRandomIteratorBenchmark, GUI)
QTEST_MAIN(KisRandomIteratorBenchmark)
......@@ -26,7 +26,7 @@ inline double drand48()
}
#endif
#include <qtest_kde.h>
#include <QTest>
#include "kis_stroke_benchmark.h"
#include "kis_benchmark_values.h"
......@@ -510,4 +510,4 @@ void KisStrokeBenchmark::benchmarkRand()
}
QTEST_KDEMAIN(KisStrokeBenchmark, GUI)
QTEST_MAIN(KisStrokeBenchmark)
......@@ -25,7 +25,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <kis_iterator_ng.h>
#include <qtest_kde.h>
#include <QTest>
void KisVLineIteratorBenchmark::initTestCase()
......@@ -166,4 +166,4 @@ void KisVLineIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()
}
QTEST_KDEMAIN(KisVLineIteratorBenchmark, GUI)
QTEST_MAIN(KisVLineIteratorBenchmark)
This diff is collapsed.
......@@ -18,7 +18,7 @@
#include "kis_adjustment_layer_test.h"
#include <qtest_kde.h>
#include <QTest>
#include <KoColorSpace.h>
......@@ -114,4 +114,4 @@ void KisAdjustmentLayerTest::testSelectionParent()
}
}
QTEST_KDEMAIN(KisAdjustmentLayerTest, GUI)
QTEST_MAIN(KisAdjustmentLayerTest)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment