void tst_qdiriterator::data()
{
-#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WINCE)
QByteArray qtdir = qPrintable(QCoreApplication::applicationDirPath());
qtdir += "/depot";
#else
dir.cd("tst");
tmpDirName = dir.absolutePath();
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE)
+#if defined(Q_WS_WINCE)
for (int i = 0; i < 100; ++i)
#else
for (int i = 0; i < 1000; ++i)
QTest::newRow("100k") << qint64(100 * 1024);
QTest::newRow("1000k") << qint64(1000 * 1024);
QTest::newRow("10000k") << qint64(10000 * 1024);
-#ifndef Q_OS_SYMBIAN // Symbian devices don't (yet) have enough available RAM to run these
QTest::newRow("100000k") << qint64(100000 * 1024);
QTest::newRow("1000000k") << qint64(1000000 * 1024);
-#endif
}
void tst_qiodevice::read_old()
int x[1000];
};
-// Symbian devices typically have limited memory
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE)
+#if defined(Q_WS_WINCE)
# define LARGE_MAX_SIZE 2000
#else
# define LARGE_MAX_SIZE 20000
static void __attribute__((noinline)) equals2_selftest()
{
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
const long pagesize = sysconf(_SC_PAGESIZE);
void *page1, *page3;
ushort *page2;
};
static const int functionCount = sizeof func / sizeof func[0];
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
const long pagesize = sysconf(_SC_PAGESIZE);
void *page1, *page3;
ushort *page2;
#include <QDeclarativeComponent>
#include <QFile>
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
class tst_compilation : public QObject
{
Q_OBJECT
#include <QDebug>
#include "testtypes.h"
-//TESTED_FILES=
-
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
class tst_qmlcomponent : public QObject
{
Q_OBJECT
--- /dev/null
+katie_test(tst_bench_qanimation
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/dummyobject.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/dummyanimation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/rectanimation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/dummyobject.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/dummyanimation.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/rectanimation.h
+)
**
****************************************************************************/
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
#include <QtGui>
#ifndef _DUMMYANIMATION_H__
#include <QtGui>
#include <qtest.h>
-#include "dummyobject.h"
+// ###: was dummyobject.h
+#include "moc_dummyobject.h"
#include "dummyanimation.h"
#include "rectanimation.h"
}
}
-
-
QTEST_MAIN(tst_qanimation)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qanimation
-DEPENDPATH += .
-INCLUDEPATH += .
-
-CONFIG += release
-
-SOURCES += main.cpp \
- dummyobject.cpp \
- dummyanimation.cpp \
- rectanimation.cpp
-
-HEADERS += dummyobject.h \
- dummyanimation.h \
- rectanimation.h
**
****************************************************************************/
+#include <QAbstractAnimation>
+#include <QEasingCurve>
+
#include "rectanimation.h"
#include "dummyobject.h"
--- /dev/null
+katie_test(tst_GraphicsViewBenchmark
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/gvbwidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractscrollarea.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/mainview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/iconitem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/label.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/scrollbar.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/simplelistview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/scroller.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/button.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/menu.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/themeevent.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/theme.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/backgrounditem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/topbar.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/commandline.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/dummydatagen.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/settings.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitemcache.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listwidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/simplelist.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/itemrecyclinglist.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/itemrecyclinglistview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractitemview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractviewitem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/recycledlistitem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitemcontainer.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractitemcontainer.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listmodel.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/GraphicsViewBenchmark.qrc
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/gvbwidget.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractscrollarea.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/mainview.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/iconitem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/label.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/scrollbar.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/simplelistview.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/scroller.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/scroller_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/button.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/menu.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/themeevent.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/theme.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/backgrounditem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/topbar.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/commandline.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/dummydatagen.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/settings.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitemcache.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listwidget.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/simplelist.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/itemrecyclinglist.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/itemrecyclinglistview.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractitemview.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractviewitem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/recycledlistitem.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listitemcontainer.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractitemcontainer.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/listmodel.h
+)
+
+target_link_libraries(tst_GraphicsViewBenchmark KtSvg)
+if(WITH_OPENGL AND OPENGL_FOUND)
+ target_link_libraries(tst_GraphicsViewBenchmark KtOpenGL)
+endif()
+target_include_directories(tst_GraphicsViewBenchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/widgets)
+
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-
-QT += svg
-contains(QT_CONFIG, opengl):QT += opengl
-
-HEADERS += widgets/gvbwidget.h \
- widgets/abstractscrollarea.h \
- widgets/mainview.h \
- widgets/iconitem.h \
- widgets/label.h \
- widgets/listitem.h \
- widgets/scrollbar.h \
- widgets/simplelistview.h \
- widgets/scroller.h \
- widgets/scroller_p.h \
- widgets/button.h \
- widgets/menu.h \
- widgets/themeevent.h \
- widgets/theme.h \
- widgets/backgrounditem.h \
- widgets/topbar.h \
- widgets/commandline.h \
- widgets/dummydatagen.h \
- widgets/settings.h \
- widgets/listitemcache.h \
- widgets/listwidget.h \
- widgets/simplelist.h \
- widgets/itemrecyclinglist.h \
- widgets/itemrecyclinglistview.h \
- widgets/abstractitemview.h \
- widgets/abstractviewitem.h \
- widgets/recycledlistitem.h \
- widgets/listitemcontainer.h \
- widgets/abstractitemcontainer.h \
- widgets/listmodel.h
-
-SOURCES += main.cpp \
- widgets/gvbwidget.cpp \
- widgets/abstractscrollarea.cpp \
- widgets/mainview.cpp \
- widgets/iconitem.cpp \
- widgets/label.cpp \
- widgets/listitem.cpp \
- widgets/scrollbar.cpp \
- widgets/simplelistview.cpp \
- widgets/scroller.cpp \
- widgets/button.cpp \
- widgets/menu.cpp \
- widgets/themeevent.cpp \
- widgets/theme.cpp \
- widgets/backgrounditem.cpp \
- widgets/topbar.cpp \
- widgets/commandline.cpp \
- widgets/dummydatagen.cpp \
- widgets/settings.cpp \
- widgets/listitemcache.cpp \
- widgets/listwidget.cpp \
- widgets/simplelist.cpp \
- widgets/itemrecyclinglist.cpp \
- widgets/itemrecyclinglistview.cpp \
- widgets/abstractitemview.cpp \
- widgets/abstractviewitem.cpp \
- widgets/recycledlistitem.cpp \
- widgets/listitemcontainer.cpp \
- widgets/abstractitemcontainer.cpp \
- widgets/listmodel.cpp
-
-TARGET = tst_GraphicsViewBenchmark
-RESOURCES += GraphicsViewBenchmark.qrc
-INCLUDEPATH += widgets
mMainView->resize(mSettings->size().width(), mSettings->size().height());
mMainView->show();
} else {
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
mMainView->showFullScreen();
#else
if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
view.resize(settings.size().width(), settings.size().height());
view.show();
} else {
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
view.showFullScreen();
#else
if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
return returnValue;
}
-#include "main.moc"
+#include "moc_main.cpp"
+#include "qrc_GraphicsViewBenchmark.cpp"
+++ /dev/null
-TEMPLATE = subdirs
-SUBDIRS = \
- GraphicsViewBenchmark
+++ /dev/null
-TEMPLATE = subdirs
-SUBDIRS = \
- #functional \ # FIXME: broken
- qgraphicsanchorlayout \
- qgraphicsitem \
- qgraphicslayout \
- qgraphicsscene \
- qgraphicsview \
- qgraphicswidget
--- /dev/null
+katie_test(tst_bench_qgraphicsanchorlayout
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsanchorlayout.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicsanchorlayout
-
-SOURCES += tst_qgraphicsanchorlayout.cpp
-
QTEST_MAIN(tst_QGraphicsAnchorLayout)
-#include "tst_qgraphicsanchorlayout.moc"
+#include "moc_tst_qgraphicsanchorlayout.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicsitem
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsitem.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicsitem
-
-SOURCES += tst_qgraphicsitem.cpp
childRect->setParentItem(lastRect);
lastRect = childRect;
}
- QGraphicsItem *first = rect.children().first();
+ QGraphicsItem *first = rect.childItems().first();
first->setParentItem(0);
}
}
}
QTEST_MAIN(tst_QGraphicsItem)
-#include "tst_qgraphicsitem.moc"
+
+#include "moc_tst_qgraphicsitem.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicslayout
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicslayout.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicslayout
-
-SOURCES += tst_qgraphicslayout.cpp
-
QTEST_MAIN(tst_QGraphicsLayout)
-#include "tst_qgraphicslayout.moc"
+#include "moc_tst_qgraphicslayout.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicslinearlayout
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicslinearlayout.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicslinearlayout
-
-SOURCES += tst_qgraphicslinearlayout.cpp
-
QTEST_MAIN(tst_QGraphicsLinearLayout)
-#include "tst_qgraphicslinearlayout.moc"
+#include "moc_tst_qgraphicslinearlayout.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicsscene
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsscene.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicsscene
-
-SOURCES += tst_qgraphicsscene.cpp
-
-symbian: TARGET.EPOCHEAPSIZE = 0x100000 0x3000000
}
QTEST_MAIN(tst_QGraphicsScene)
-#include "tst_qgraphicsscene.moc"
+
+#include "moc_tst_qgraphicsscene.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicsview
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chiptester.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chip.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chiptester.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chip.h
+)
+
+set(test_resources
+ ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/images.qrc
+ ${CMAKE_CURRENT_SOURCE_DIR}/qgraphicsview.qrc
+)
+katie_resource(
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsview.cpp
+ "${test_resources}"
+ tst_qgraphicsview
+)
+
+if(WITH_OPENGL AND OPENGL_FOUND)
+ target_link_libraries(tst_bench_qgraphicsview KtOpenGL)
+endif()
\ No newline at end of file
setZValue((x + y) % 2);
setFlags(ItemIsSelectable | ItemIsMovable);
- setAcceptsHoverEvents(true);
+ setAcceptHoverEvents(true);
}
QRectF Chip::boundingRect() const
return app.exec();
}
-#include "main.moc"
+#include "moc_main.cpp"
return app.exec();
}
-#include "main.moc"
+#include "moc_main.cpp"
#include "chip.h"
+#include "QtCore/qvarlengtharray.h"
#include <QtGui>
Chip::Chip(const QColor &color, int x, int y)
setZValue((x + y) % 2);
setFlags(ItemIsSelectable | ItemIsMovable);
- setAcceptsHoverEvents(true);
+ setAcceptHoverEvents(true);
}
QRectF Chip::boundingRect() const
QGraphicsItem::mouseReleaseEvent(event);
update();
}
+
+#include "chiptester/moc_chiptester.h"
\ No newline at end of file
+++ /dev/null
-SOURCES += \
- chiptester/chiptester.cpp \
- chiptester/chip.cpp
-
-HEADERS += \
- chiptester/chiptester.h \
- chiptester/chip.h
-
-RESOURCES += \
- chiptester/images.qrc
-
-contains(QT_CONFIG, opengl) QT += opengl
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicsview
-
-SOURCES += tst_qgraphicsview.cpp
-RESOURCES += qgraphicsview.qrc
-
-include(chiptester/chiptester.pri)
-
-symbian {
- qt_not_deployed {
- plugins.files = qjpeg.dll
- plugins.path = imageformats
- DEPLOYMENT += plugins
- }
-}
}
QTEST_MAIN(tst_QGraphicsView)
-#include "tst_qgraphicsview.moc"
+
+#include "moc_tst_qgraphicsview.cpp"
+#include "qrc_tst_qgraphicsview.cpp"
--- /dev/null
+katie_test(tst_bench_qgraphicswidget
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicswidget.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qgraphicswidget
-TEMPLATE = app
-# Input
-SOURCES += tst_qgraphicswidget.cpp
}
QTEST_MAIN(tst_QGraphicsWidget)
-#include "tst_qgraphicswidget.moc"
+
+#include "moc_tst_qgraphicswidget.cpp"
--- /dev/null
+katie_test(tst_bench_blendbench
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_blendbench
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
QTEST_MAIN(BlendBench)
-#include "main.moc"
+#include "moc_main.cpp"
--- /dev/null
+katie_test(tst_bench_imageConversion
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qimageconversion.cpp
+)
+
+# GIF is built-in supported
+target_compile_definitions(tst_bench_imageConversion PRIVATE -DQTEST_HAVE_GIF)
+if(WITH_JPEG AND JPEG_FOUND)
+ target_compile_definitions(tst_bench_imageConversion PRIVATE -DQTEST_HAVE_JPEG)
+endif()
+if(WITH_MNG AND MNG_FOUND)
+ target_compile_definitions(tst_bench_imageConversion PRIVATE -DQTEST_HAVE_MNG)
+endif()
+if(WITH_TIFF AND TIFF_FOUND)
+ target_compile_definitions(tst_bench_imageConversion PRIVATE -DQTEST_HAVE_TIFF)
+endif()
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_imageConversion
-
-SOURCES += tst_qimageconversion.cpp
-
-!contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF
-!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
-!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG
-!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF
}
QTEST_MAIN(tst_QImageConversion)
-#include "tst_qimageconversion.moc"
+
+#include "moc_tst_qimageconversion.cpp"
--- /dev/null
+katie_test(tst_bench_qimagereader
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qimagereader.cpp
+)
+
+# GIF is built-in supported
+target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_GIF)
+if(WITH_JPEG AND JPEG_FOUND)
+ target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_JPEG)
+endif()
+if(WITH_MNG AND MNG_FOUND)
+ target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_MNG)
+endif()
+if(WITH_TIFF AND TIFF_FOUND)
+ target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_TIFF)
+endif()
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qimagereader
-
-SOURCES += tst_qimagereader.cpp
-
-!contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF
-!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
-!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG
-!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF
-QT += network
-
-wince*: {
- addFiles.files = images
- addFiles.path = .
-
- CONFIG(debug, debug|release):{
- imageFormatsPlugins.files = $$(QTDIR)/plugins/imageformats/*d4.dll
- }
-
- CONFIG(release, debug|release):{
- imageFormatsPlugins.files = $$(QTDIR)/plugins/imageformats/*[^d]4.dll
- }
- imageFormatsPlugins.path = imageformats
- DEPLOYMENT += addFiles imageFormatsPlugins
-}
-
}
QTEST_MAIN(tst_QImageReader)
-#include "tst_qimagereader.moc"
+
+#include "moc_tst_qimagereader.cpp"
--- /dev/null
+katie_test(tst_bench_qpixmap
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpixmap.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qpixmap
-
-SOURCES += tst_qpixmap.cpp
#include <QImageReader>
#include <QPainter>
#include <QPixmap>
-#include <private/qpixmap_raster_p.h>
+#include <qpixmap_raster_p.h>
class tst_QPixmap : public QObject
{
QTEST_MAIN(tst_QPixmap)
-#include "tst_qpixmap.moc"
+#include "moc_tst_qpixmap.cpp"
--- /dev/null
+katie_test(tst_bench_qpixmapcache
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpixmapcache.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qpixmapcache
-TEMPLATE = app
-# Input
-SOURCES += tst_qpixmapcache.cpp
QTEST_MAIN(tst_QPixmapCache)
-#include "tst_qpixmapcache.moc"
+
+#include "moc_tst_qpixmapcache.cpp"
--- /dev/null
+katie_test(tst_bench_qtableview
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtableview.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qtableview
-
-SOURCES += tst_qtableview.cpp
-
}
QTEST_MAIN(tst_QTableView)
-#include "tst_qtableview.moc"
+
+#include "moc_tst_qtableview.cpp"
--- /dev/null
+katie_test(tst_bench_qapplication
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
QTEST_APPLESS_MAIN(tst_qapplication)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qapplication
-DEPENDPATH += .
-INCLUDEPATH += .
-
-CONFIG += release
-
-# Input
-SOURCES += main.cpp
--- /dev/null
+katie_test(tst_bench_qguimetatype
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qguimetatype.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qguimetatype
-
-SOURCES += tst_qguimetatype.cpp
-
}
QTEST_MAIN(tst_QGuiMetaType)
-#include "tst_qguimetatype.moc"
+
+#include "moc_tst_qguimetatype.cpp"
--- /dev/null
+katie_test(tst_bench_qguivariant
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qguivariant.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qguivariant
-
-SOURCES += tst_qguivariant.cpp
-
}
QTEST_MAIN(tst_QGuiVariant)
-#include "tst_qguivariant.moc"
+
+#include "moc_tst_qguivariant.cpp"
--- /dev/null
+katie_test(tst_bench_qwidget
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qwidget.cpp
+)
+++ /dev/null
-load(qttest_p4)
-
-TARGET = tst_bench_qwidget
-SOURCES += tst_qwidget.cpp
QTest::newRow("10x10x1 opaque") << 10 << 10 << 1 << true;
QTest::newRow("10x10x10 opaque") << 10 << 10 << 10 << true;
QTest::newRow("10x10x100 opaque") << 10 << 10 << 100 << true;
-#ifndef Q_OS_SYMBIAN
- //These test cases cause stack overflow in QWidgetPrivate::paintSiblingsRecursive
- //see http://bugreports.qt-project.org/browse/QTBUG-8512
- //Symbian threads have a hard limit of 80kB user stack
QTest::newRow("25x25x1 transparent ") << 25 << 25 << 1 << false;
QTest::newRow("25x25x10 transparent") << 25 << 25 << 10 << false;
QTest::newRow("25x25x100 transparent") << 25 << 25 << 100 << false;
QTest::newRow("25x25x1 opaque") << 25 << 25 << 1 << true;
QTest::newRow("25x25x10 opaque") << 25 << 25 << 10 << true;
QTest::newRow("25x25x100 opaque") << 25 << 25 << 100 << true;
-#endif
}
void tst_QWidget::update()
QTEST_MAIN(tst_QWidget)
-#include "tst_qwidget.moc"
+#include "moc_tst_qwidget.cpp"
--- /dev/null
+katie_test(tst_bench_qmatrix4x4
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qmatrix4x4.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qmatrix4x4
-
-SOURCES += tst_qmatrix4x4.cpp
-
QTEST_MAIN(tst_QMatrix4x4)
-#include "tst_qmatrix4x4.moc"
+#include "moc_tst_qmatrix4x4.cpp"
--- /dev/null
+katie_test(tst_bench_qquaternion
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qquaternion.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qquaternion
-
-SOURCES += tst_qquaternion.cpp
-
}
QTEST_MAIN(tst_QQuaternion)
-#include "tst_qquaternion.moc"
+
+#include "moc_tst_qquaternion.cpp"
--- /dev/null
+katie_test(tst_bench_qpainter
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpainter.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qpainter
-
-SOURCES += tst_qpainter.cpp
-
-symbian: TARGET.EPOCHEAPSIZE = 0x100000 0x3000000
#include <qtest.h>
#include <QPainter>
+#include <QPen>
#include <QPixmap>
#include <QDialog>
#include <QImage>
#define M_PI 3.14159265358979323846
#endif
-#include <private/qpixmap_raster_p.h>
+#include <qpixmap_raster_p.h>
Q_DECLARE_METATYPE(QLine)
Q_DECLARE_METATYPE(QRect)
QTEST_MAIN(tst_QPainter)
-#include "tst_qpainter.moc"
+#include "moc_tst_qpainter.cpp"
--- /dev/null
+katie_test(tst_bench_qregion
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
QTEST_MAIN(tst_qregion)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qregion
-DEPENDPATH += .
-INCLUDEPATH += .
-
-CONFIG += release
-
-# Input
-SOURCES += main.cpp
--- /dev/null
+katie_test(tst_qtbench
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtbench.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_qtbench
-
-SOURCES += tst_qtbench.cpp
-
#include <qtest.h>
+#include <QtCore/qmath.h>
#include <QtGui>
#include "benchmarktests.h"
-//TESTED_FILES=
-
class BenchWidget : public QWidget
{
public:
}
QTEST_MAIN(tst_QtBench)
-#include "tst_qtbench.moc"
+
+#include "moc_tst_qtbench.cpp"
--- /dev/null
+katie_test(tst_qtracebench
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtracebench.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/qtracebench.qrc
+)
+
+if(WITH_HARFBUZZ AND HARFBUZZ_FOUND)
+ target_include_directories(tst_qtracebench PRIVATE ${HARFBUZZ_INCLUDE_DIRS})
+else()
+ target_include_directories(tst_qtracebench PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src)
+endif()
\ No newline at end of file
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_qtracebench
-
-INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
-
-RESOURCES += qtracebench.qrc
-
-SOURCES += tst_qtracebench.cpp
-
#include <qtest.h>
+#include <QtCore/qmath.h>
#include <QtGui>
-#include <private/qpaintengineex_p.h>
-#include <private/qpaintbuffer_p.h>
-
-//TESTED_FILES=
+#include <qpaintengineex_p.h>
+#include <qpaintbuffer_p.h>
class ReplayWidget : public QWidget
{
}
QTEST_MAIN(tst_QTraceBench)
-#include "tst_qtracebench.moc"
+
+#include "moc_tst_qtracebench.cpp"
+#include "qrc_qtracebench.cpp"
--- /dev/null
+katie_test(tst_bench_qtransform
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtransform.cpp
+)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qtransform
-
-SOURCES += tst_qtransform.cpp
-
}
QTEST_MAIN(tst_QTransform)
-#include "tst_qtransform.moc"
+
+#include "moc_tst_qtransform.cpp"
--- /dev/null
+katie_test(tst_bench_qstylesheetstyle
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
QFETCH(bool, show);
QFETCH(int, N);
-#ifdef Q_OS_SYMBIAN
- // Symbian has limited stack (max 80k), which will run out when N >= 20 due to
- // QWidget::show() using recursion among grid labels somewhere down the line.
- if (show && N >= 20)
- QSKIP("Grid too big for device to show", SkipSingle);
-#endif
-
QWidget *w = new QWidget();
QGridLayout *layout = new QGridLayout(w);
w->setLayout(layout);
QTEST_MAIN(tst_qstylesheetstyle)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qstylesheetstyle
-DEPENDPATH += .
-INCLUDEPATH += .
-
-
-CONFIG += release
-
-# Input
-SOURCES += main.cpp
--- /dev/null
+katie_test(tst_bench_QFontMetrics
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
QTEST_MAIN(tst_QFontMetrics)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_QFontMetrics
-
-SOURCES += main.cpp
--- /dev/null
+katie_test(tst_bench_QText
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
#include <QTextDocumentWriter>
#include <QTextLayout>
#include <QTextCursor>
-#include <private/qtextcontrol_p.h>
+#include <qtextcontrol_p.h>
#include <qmath.h>
#include <QFile>
#include <QPainter>
#include <QBuffer>
#include <qtest.h>
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR ""
-#endif
-
Q_DECLARE_METATYPE(QTextDocument*)
class tst_QText: public QObject
QTest::newRow("lorem") << m_lorem;
QTest::newRow("short") << QString::fromLatin1("Lorem ipsum dolor sit amet");
-#if !defined(Q_OS_SYMBIAN)
QFile file(QString::fromLatin1(SRCDIR) + QLatin1String("/bidi.txt"));
-#else
- QFile file( SRCDIR "bidi.txt" );
-#endif
QVERIFY(file.open(QFile::ReadOnly));
QByteArray data = file.readAll();
QVERIFY(data.count() > 1000);
QTEST_MAIN(tst_QText)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_QText
-
-SOURCES += main.cpp
-
-symbian* {
- TARGET.CAPABILITY = ALL -TCB
- addFiles.files = bidi.txt
- addFiles.path = .
- DEPLOYMENT += addFiles
-} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
-}
\ No newline at end of file
--- /dev/null
+katie_test(tst_bench_qfile_vs_qnetworkaccessmanager
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+target_link_libraries(tst_bench_qfile_vs_qnetworkaccessmanager KtNetwork)
{
testFile.open();
QByteArray qba(1*1024*1024, 'x'); // 1 MB
-#ifdef Q_OS_SYMBIAN
- for (int i = 0; i < 10; i++) { // for Symbian only 10 MB
-#else
for (int i = 0; i < 100; i++) {
-#endif
testFile.write(qba);
testFile.flush();
size += qba.size();
QTEST_MAIN(qfile_vs_qnetworkaccessmanager)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qfile_vs_qnetworkaccessmanager
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT -= gui
-QT += network
-
-CONFIG += release
-
-# Input
-SOURCES += main.cpp
--- /dev/null
+katie_test(tst_bench_qnetworkdiskcache
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qnetworkdiskcache.cpp
+)
+
+target_link_libraries(tst_bench_qnetworkdiskcache KtNetwork)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qnetworkdiskcache
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT += gui # for QDesktopServices
-QT += network testlib
-
-CONFIG += release
-
-# Input
-SOURCES += tst_qnetworkdiskcache.cpp
-
-
#include <QtTest/QtTest>
#include <QIODevice>
#include <QDesktopServices>
-
+#include <QDirIterator>
enum Numbers { NumFakeCacheObjects = 200, //entries in pre-populated cache
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
//This functions times an insert() operation.
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
//Times metadata as well payload lookup
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
void tst_qnetworkdiskcache::timeRemoval()
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
void tst_qnetworkdiskcache::timeExpiration()
{
}
QTEST_MAIN(tst_qnetworkdiskcache)
-#include "tst_qnetworkdiskcache.moc"
+
+#include "moc_tst_qnetworkdiskcache.cpp"
--- /dev/null
+katie_test(tst_bench_qnetworkreply
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qnetworkreply.cpp
+)
+
+target_link_libraries(tst_bench_qnetworkreply KtNetwork)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qnetworkreply
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT -= gui
-QT += network
-
-CONFIG += release
-
-# Input
-SOURCES += tst_qnetworkreply.cpp
// This file contains benchmarks for QNetworkReply functions.
#include <QDebug>
+#include <QThread>
+#include <QSemaphore>
+#include <QTimer>
#include <qtest.h>
#include <QtTest/QtTest>
#include <QtNetwork/qnetworkreply.h>
void tst_qnetworkreply::httpUploadPerformance()
{
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
// SHow some mercy for non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
{
QFETCH(bool, serverSendsContentLength);
QFETCH(bool, chunkedEncoding);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType);
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
QTEST_MAIN(tst_qnetworkreply)
-#include "tst_qnetworkreply.moc"
+#include "moc_tst_qnetworkreply.cpp"
--- /dev/null
+katie_test(tst_bench_qhostinfo
+ ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+target_link_libraries(tst_bench_qhostinfo KtNetwork)
#include <qtest.h>
#include <qtesteventloop.h>
-#include "private/qhostinfo_p.h"
+#include "qhostinfo_p.h"
class tst_qhostinfo : public QObject
{
QTEST_MAIN(tst_qhostinfo)
-#include "main.moc"
+#include "moc_main.cpp"
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qhostinfo
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT -= gui
-QT += network
-
-CONFIG += release
-
-# Input
-SOURCES += main.cpp
-
-symbian: {
- TARGET.CAPABILITY = NetworkServices
- INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
-}
--- /dev/null
+katie_test(tst_bench_qtcpserver
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtcpserver.cpp
+)
+
+target_link_libraries(tst_bench_qtcpserver KtNetwork)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qtcpserver
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT -= gui
-QT += network
-
-CONFIG += release
-
-# Input
-SOURCES += tst_qtcpserver.cpp
-
-symbian: {
- TARGET.CAPABILITY = NetworkServices
- INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
-}
#include "../../../../auto/network-settings.h"
-//TESTED_CLASS=
-//TESTED_FILES=
-
class tst_QTcpServer : public QObject
{
Q_OBJECT
}
QTEST_MAIN(tst_QTcpServer)
-#include "tst_qtcpserver.moc"
+
+#include "moc_tst_qtcpserver.cpp"
--- /dev/null
+katie_test(tst_bench_qsslsocket
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_qsslsocket.cpp
+)
+
+target_link_libraries(tst_bench_qsslsocket KtNetwork)
+++ /dev/null
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qsslsocket
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT -= gui
-QT += network
-
-CONFIG += release
-
-# Input
-SOURCES += tst_qsslsocket.cpp
-
-symbian: {
- TARGET.CAPABILITY = NetworkServices
- INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
-}
}
QTEST_MAIN(tst_QSslSocket)
-#include "tst_qsslsocket.moc"
+
+#include "moc_tst_qsslsocket.cpp"
newEngine();
m_engine->globalObject().setProperty("fun", m_engine->newFunction(native_function));
QBENCHMARK{
-#if !defined(Q_OS_SYMBIAN)
- m_engine->evaluate("var w = 0; for (i = 0; i < 100000; ++i) {\n"
- " w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#else
m_engine->evaluate("var w = 0; for (i = 0; i < 25000; ++i) {\n"
" w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#endif
}
}
OSDN Git Service
