From 8d240f4997af5cfe7f41e5bb596412b631f3efb1 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 17 May 2019 20:46:49 +0000 Subject: [PATCH] deal with FIXME about tests Signed-off-by: Ivailo Monev --- CMakeLists.txt | 4 +- cmake/modules/KatieBuildMacros.cmake | 24 +- src/shared/qclass_lib_map.h | 542 +++++++++--------- tests/CMakeLists.txt | 3 + .../qlocale/syslocaleapp/syslocaleapp.cpp | 2 + .../gui/animation/qanimation/CMakeLists.txt | 2 +- .../CMakeLists.txt.broken | 2 +- .../qgraphicsanchorlayout/CMakeLists.txt | 2 +- .../graphicsview/qgraphicsitem/CMakeLists.txt | 2 +- .../qgraphicslayout/CMakeLists.txt | 2 +- .../qgraphicslinearlayout/CMakeLists.txt | 2 +- .../qgraphicsscene/CMakeLists.txt | 2 +- .../graphicsview/qgraphicsview/CMakeLists.txt | 2 +- .../qgraphicswidget/CMakeLists.txt | 2 +- .../gui/image/blendbench/CMakeLists.txt | 2 +- .../gui/image/qimageconversion/CMakeLists.txt | 14 +- .../gui/image/qimagereader/CMakeLists.txt | 2 +- .../gui/image/qpixmap/CMakeLists.txt | 2 +- .../gui/image/qpixmapcache/CMakeLists.txt | 2 +- .../gui/itemviews/qtableview/CMakeLists.txt | 2 +- .../gui/kernel/qapplication/CMakeLists.txt | 2 +- .../gui/kernel/qguimetatype/CMakeLists.txt | 2 +- .../gui/kernel/qguivariant/CMakeLists.txt | 2 +- .../gui/kernel/qwidget/CMakeLists.txt | 2 +- .../gui/math3d/qmatrix4x4/CMakeLists.txt | 2 +- .../gui/math3d/qquaternion/CMakeLists.txt | 2 +- .../gui/painting/qpainter/CMakeLists.txt | 2 +- .../gui/painting/qregion/CMakeLists.txt | 2 +- .../gui/painting/qtbench/CMakeLists.txt | 2 +- .../gui/painting/qtransform/CMakeLists.txt | 2 +- .../styles/qstylesheetstyle/CMakeLists.txt | 2 +- .../gui/text/qfontmetrics/CMakeLists.txt | 2 +- .../benchmarks/gui/text/qtext/CMakeLists.txt | 2 +- .../access/qnetworkdiskcache/CMakeLists.txt | 2 +- .../script/qscriptclass/tst_qscriptclass.cpp | 1 + .../script/qscriptqobject/CMakeLists.txt | 2 +- 36 files changed, 330 insertions(+), 318 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea42a6fb..afee889a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ toolkit derived from the Qt 4.8 frame set(CPACK_PACKAGE_VENDOR "Katie") set(CPACK_PACKAGE_CONTACT "xakepa10@gmail.com") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") -# set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/Copyright.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LGPL_EXCEPTION.txt") set(CPACK_PACKAGE_VERSION_MAJOR "4") set(CPACK_PACKAGE_VERSION_MINOR "9") set(CPACK_PACKAGE_VERSION_PATCH "0") @@ -493,8 +493,6 @@ if(ENABLE_TESTING) ) enable_testing() add_definitions(-DQT_BUILD_INTERNAL) - # FIXME: most tests are not namespaces aware - add_definitions(-DQT_NAMESPACE_COMPAT) configure_file( ${CMAKE_SOURCE_DIR}/cmake/runtest.sh.cmake diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index fc146d965..6ef76816c 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -273,8 +273,28 @@ macro(KATIE_TEST TESTNAME TESTSOURCES) add_executable(${TESTNAME} ${TESTSOURCES} ${ARGN}) - # TODO: make GUI access optional, it is required by many tests so it should - # still be default + target_link_libraries(${TESTNAME} KtCore KtTest) + target_compile_definitions( + ${TESTNAME} PRIVATE + -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" + ) + set_target_properties( + ${TESTNAME} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + add_test( + NAME ${TESTNAME} + COMMAND ${CMAKE_BINARY_DIR}/runtest.sh ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} + ) +endmacro() + +# a macro to add tests easily by setting them up with the assumptions they make +macro(KATIE_GUI_TEST TESTNAME TESTSOURCES) + katie_resources(${TESTSOURCES} ${ARGN}) + + add_executable(${TESTNAME} ${TESTSOURCES} ${ARGN}) + target_link_libraries(${TESTNAME} KtCore KtGui KtTest) target_compile_definitions( ${TESTNAME} PRIVATE diff --git a/src/shared/qclass_lib_map.h b/src/shared/qclass_lib_map.h index 9c0648fd8..4137375bb 100644 --- a/src/shared/qclass_lib_map.h +++ b/src/shared/qclass_lib_map.h @@ -4,139 +4,106 @@ #define QT_CLASS_MAP_H static const ClassInfoEntry qclass_lib_map[] = { - { "QTextCodec", "QtCore/qtextcodec.h"}, - { "ConverterState", "QtCore/qtextcodec.h"}, - { "QTextEncoder", "QtCore/qtextcodec.h"}, - { "QTextDecoder", "QtCore/qtextcodec.h"}, - { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"}, - { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"}, - { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"}, - { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"}, - { "Exception", "QtCore/qtconcurrentexception.h"}, - { "UnhandledException", "QtCore/qtconcurrentexception.h"}, - { "ExceptionStore", "QtCore/qtconcurrentexception.h"}, - { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"}, - { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"}, - { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"}, - { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"}, - { "QThreadPool", "QtCore/qthreadpool.h"}, - { "QBitArray", "QtCore/qbitarray.h"}, - { "QBitRef", "QtCore/qbitarray.h"}, - { "QByteArray", "QtCore/qbytearray.h"}, - { "QByteRef", "QtCore/qbytearray.h"}, - { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"}, - { "QChar", "QtCore/qchar.h"}, - { "QCommandLineOption", "QtCore/qcommandlineoption.h"}, - { "QCommandLineParser", "QtCore/qcommandlineparser.h"}, - { "QContiguousCacheData", "QtCore/qcontiguouscache.h"}, - { "QCryptographicHash", "QtCore/qcryptographichash.h"}, - { "QDate", "QtCore/qdatetime.h"}, - { "QTime", "QtCore/qdatetime.h"}, - { "QDateTime", "QtCore/qdatetime.h"}, - { "QEasingCurve", "QtCore/qeasingcurve.h"}, - { "QElapsedTimer", "QtCore/qelapsedtimer.h"}, - { "QHashData", "QtCore/qhash.h"}, - { "QLine", "QtCore/qline.h"}, - { "QLineF", "QtCore/qline.h"}, - { "QLinkedListData", "QtCore/qlinkedlist.h"}, - { "QListData", "QtCore/qlist.h"}, - { "QSystemLocale", "QtCore/qlocale.h"}, - { "QLocale", "QtCore/qlocale.h"}, - { "QMapData", "QtCore/qmap.h"}, - { "QPoint", "QtCore/qpoint.h"}, - { "QPointF", "QtCore/qpoint.h"}, - { "QRect", "QtCore/qrect.h"}, - { "QRectF", "QtCore/qrect.h"}, - { "QRegExp", "QtCore/qregexp.h"}, - { "QSharedData", "QtCore/qshareddata.h"}, - { "QSize", "QtCore/qsize.h"}, - { "QSizeF", "QtCore/qsize.h"}, - { "QString", "QtCore/qstring.h"}, - { "QLatin1String", "QtCore/qstring.h"}, - { "QCharRef", "QtCore/qstring.h"}, - { "QStringRef", "QtCore/qstring.h"}, - { "QStringList", "QtCore/qstringlist.h"}, - { "QStringMatcher", "QtCore/qstringmatcher.h"}, - { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"}, - { "QTimeLine", "QtCore/qtimeline.h"}, - { "QVectorData", "QtCore/qvector.h"}, - { "QAtomicInt", "QtCore/qatomic.h"}, - { "QAtomicPointer", "QtCore/qatomic.h"}, - { "QMutex", "QtCore/qmutex.h"}, - { "QMutexLocker", "QtCore/qmutex.h"}, - { "QReadWriteLock", "QtCore/qreadwritelock.h"}, - { "QReadLocker", "QtCore/qreadwritelock.h"}, - { "QWriteLocker", "QtCore/qreadwritelock.h"}, - { "QSemaphore", "QtCore/qsemaphore.h"}, - { "QThread", "QtCore/qthread.h"}, - { "QWaitCondition", "QtCore/qwaitcondition.h"}, - { "QFactoryInterface", "QtCore/qfactoryinterface.h"}, - { "QLibrary", "QtCore/qlibrary.h"}, - { "QPluginLoader", "QtCore/qpluginloader.h"}, - { "QUuid", "QtCore/quuid.h"}, - { "QLibraryInfo", "QtCore/qlibraryinfo.h"}, - { "QInternal", "QtCore/qnamespace.h"}, - { "QJsonArray", "QtCore/qjsonarray.h"}, - { "QJsonParseError", "QtCore/qjsondocument.h"}, - { "QJsonDocument", "QtCore/qjsondocument.h"}, - { "QJsonObject", "QtCore/qjsonobject.h"}, - { "QJsonValue", "QtCore/qjsonvalue.h"}, - { "QJsonValueRef", "QtCore/qjsonvalue.h"}, - { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"}, - { "QJsonValuePtr", "QtCore/qjsonvalue.h"}, - { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"}, - { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"}, - { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"}, - { "QBuffer", "QtCore/qbuffer.h"}, - { "QDataStream", "QtCore/qdatastream.h"}, - { "QDebug", "QtCore/qdebug.h"}, - { "QDir", "QtCore/qdir.h"}, - { "QDirIterator", "QtCore/qdiriterator.h"}, - { "QFile", "QtCore/qfile.h"}, - { "QFileInfo", "QtCore/qfileinfo.h"}, - { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"}, - { "QFSFileEngine", "QtCore/qfsfileengine.h"}, - { "QIODevice", "QtCore/qiodevice.h"}, - { "QProcessEnvironment", "QtCore/qprocess.h"}, - { "QProcess", "QtCore/qprocess.h"}, - { "QResource", "QtCore/qresource.h"}, - { "QSettings", "QtCore/qsettings.h"}, - { "QStandardPaths", "QtCore/qstandardpaths.h"}, - { "QTemporaryFile", "QtCore/qtemporaryfile.h"}, - { "QTextStream", "QtCore/qtextstream.h"}, - { "QTextStreamManipulator", "QtCore/qtextstream.h"}, - { "QUrl", "QtCore/qurl.h"}, - { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"}, - { "QModelIndex", "QtCore/qabstractitemmodel.h"}, - { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"}, - { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"}, - { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"}, - { "QAbstractListModel", "QtCore/qabstractitemmodel.h"}, - { "QBasicTimer", "QtCore/qbasictimer.h"}, - { "QCoreApplication", "QtCore/qcoreapplication.h"}, - { "QEvent", "QtCore/qcoreevent.h"}, - { "QTimerEvent", "QtCore/qcoreevent.h"}, - { "QChildEvent", "QtCore/qcoreevent.h"}, - { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"}, - { "QEventLoop", "QtCore/qeventloop.h"}, - { "QMetaMethod", "QtCore/qmetaobject.h"}, - { "QMetaEnum", "QtCore/qmetaobject.h"}, - { "QMetaProperty", "QtCore/qmetaobject.h"}, - { "QMetaClassInfo", "QtCore/qmetaobject.h"}, - { "QMetaType", "QtCore/qmetatype.h"}, - { "QMimeData", "QtCore/qmimedata.h"}, - { "QObject", "QtCore/qobject.h"}, - { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"}, - { "QGenericArgument", "QtCore/qobjectdefs.h"}, - { "QGenericReturnArgument", "QtCore/qobjectdefs.h"}, - { "QMetaObject", "QtCore/qobjectdefs.h"}, - { "QSharedMemory", "QtCore/qsharedmemory.h"}, - { "QSignalMapper", "QtCore/qsignalmapper.h"}, - { "QSocketNotifier", "QtCore/qsocketnotifier.h"}, - { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"}, - { "QTimer", "QtCore/qtimer.h"}, - { "QTranslator", "QtCore/qtranslator.h"}, - { "QVariant", "QtCore/qvariant.h"}, + { "QDomImplementation", "QtXml/qdom.h"}, + { "QDomNode", "QtXml/qdom.h"}, + { "QDomNodeList", "QtXml/qdom.h"}, + { "QDomDocumentType", "QtXml/qdom.h"}, + { "QDomDocument", "QtXml/qdom.h"}, + { "QDomNamedNodeMap", "QtXml/qdom.h"}, + { "QDomDocumentFragment", "QtXml/qdom.h"}, + { "QDomCharacterData", "QtXml/qdom.h"}, + { "QDomAttr", "QtXml/qdom.h"}, + { "QDomElement", "QtXml/qdom.h"}, + { "QDomText", "QtXml/qdom.h"}, + { "QDomComment", "QtXml/qdom.h"}, + { "QDomCDATASection", "QtXml/qdom.h"}, + { "QDomNotation", "QtXml/qdom.h"}, + { "QDomEntity", "QtXml/qdom.h"}, + { "QDomEntityReference", "QtXml/qdom.h"}, + { "QDomProcessingInstruction", "QtXml/qdom.h"}, + { "QXmlNamespaceSupport", "QtXml/qxml.h"}, + { "QXmlAttributes", "QtXml/qxml.h"}, + { "QXmlInputSource", "QtXml/qxml.h"}, + { "QXmlParseException", "QtXml/qxml.h"}, + { "QXmlReader", "QtXml/qxml.h"}, + { "QXmlSimpleReader", "QtXml/qxml.h"}, + { "QXmlLocator", "QtXml/qxml.h"}, + { "QXmlContentHandler", "QtXml/qxml.h"}, + { "QXmlErrorHandler", "QtXml/qxml.h"}, + { "QXmlDTDHandler", "QtXml/qxml.h"}, + { "QXmlEntityResolver", "QtXml/qxml.h"}, + { "QXmlLexicalHandler", "QtXml/qxml.h"}, + { "QXmlDeclHandler", "QtXml/qxml.h"}, + { "QXmlDefaultHandler", "QtXml/qxml.h"}, + { "QXmlStreamAttribute", "QtXml/qxmlstream.h"}, + { "QXmlStreamAttributes", "QtXml/qxmlstream.h"}, + { "QXmlStreamNamespaceDeclaration", "QtXml/qxmlstream.h"}, + { "QXmlStreamNotationDeclaration", "QtXml/qxmlstream.h"}, + { "QXmlStreamEntityDeclaration", "QtXml/qxmlstream.h"}, + { "QXmlStreamEntityResolver", "QtXml/qxmlstream.h"}, + { "QXmlStreamReader", "QtXml/qxmlstream.h"}, + { "QXmlStreamWriter", "QtXml/qxmlstream.h"}, + { "QAbstractSocket", "QtNetwork/qabstractsocket.h"}, + { "QLocalServer", "QtNetwork/qlocalserver.h"}, + { "QLocalSocket", "QtNetwork/qlocalsocket.h"}, + { "QTcpServer", "QtNetwork/qtcpserver.h"}, + { "QTcpSocket", "QtNetwork/qtcpsocket.h"}, + { "QUdpSocket", "QtNetwork/qudpsocket.h"}, + { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"}, + { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"}, + { "QNetworkSession", "QtNetwork/qnetworksession.h"}, + { "QAuthenticator", "QtNetwork/qauthenticator.h"}, + { "QIPv6Address", "QtNetwork/qhostaddress.h"}, + { "QHostAddress", "QtNetwork/qhostaddress.h"}, + { "QHostInfo", "QtNetwork/qhostinfo.h"}, + { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"}, + { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"}, + { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"}, + { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"}, + { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"}, + { "QUrlInfo", "QtNetwork/qurlinfo.h"}, + { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"}, + { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"}, + { "QFtp", "QtNetwork/qftp.h"}, + { "QHttpHeader", "QtNetwork/qhttp.h"}, + { "QHttpResponseHeader", "QtNetwork/qhttp.h"}, + { "QHttpRequestHeader", "QtNetwork/qhttp.h"}, + { "QHttp", "QtNetwork/qhttp.h"}, + { "QHttpPart", "QtNetwork/qhttpmultipart.h"}, + { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"}, + { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"}, + { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"}, + { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"}, + { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"}, + { "QNetworkReply", "QtNetwork/qnetworkreply.h"}, + { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"}, + { "QSslCertificate", "QtNetwork/qsslcertificate.h"}, + { "QSslCipher", "QtNetwork/qsslcipher.h"}, + { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"}, + { "QSslError", "QtNetwork/qsslerror.h"}, + { "QSslKey", "QtNetwork/qsslkey.h"}, + { "QSslSocket", "QtNetwork/qsslsocket.h"}, + { "QScriptable", "QtScript/qscriptable.h"}, + { "QScriptClass", "QtScript/qscriptclass.h"}, + { "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"}, + { "QScriptContext", "QtScript/qscriptcontext.h"}, + { "QScriptContextInfo", "QtScript/qscriptcontextinfo.h"}, + { "QScriptSyntaxCheckResult", "QtScript/qscriptengine.h"}, + { "QScriptEngine", "QtScript/qscriptengine.h"}, + { "QScriptEngineAgent", "QtScript/qscriptengineagent.h"}, + { "QScriptExtensionInterface", "QtScript/qscriptextensioninterface.h"}, + { "QScriptExtensionPlugin", "QtScript/qscriptextensionplugin.h"}, + { "QScriptProgram", "QtScript/qscriptprogram.h"}, + { "QScriptString", "QtScript/qscriptstring.h"}, + { "QScriptValue", "QtScript/qscriptvalue.h"}, + { "QScriptValueIterator", "QtScript/qscriptvalueiterator.h"}, + { "QAbstractFormBuilder", "QtUiTools/abstractformbuilder.h"}, + { "QFormBuilder", "QtUiTools/formbuilder.h"}, + { "QUiLoader", "QtUiTools/quiloader.h"}, + { "QGraphicsSvgItem", "QtSvg/qgraphicssvgitem.h"}, + { "QSvgGenerator", "QtSvg/qsvggenerator.h"}, + { "QSvgRenderer", "QtSvg/qsvgrenderer.h"}, + { "QSvgWidget", "QtSvg/qsvgwidget.h"}, { "QAbstractTextDocumentLayout", "QtGui/qabstracttextdocumentlayout.h"}, { "QTextObjectInterface", "QtGui/qabstracttextdocumentlayout.h"}, { "QFont", "QtGui/qfont.h"}, @@ -503,6 +470,177 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QProgressDialog", "QtGui/qprogressdialog.h"}, { "QWizard", "QtGui/qwizard.h"}, { "QWizardPage", "QtGui/qwizard.h"}, + { "QBenchmarkIterationController", "QtTest/qbenchmark.h"}, + { "QTestData", "QtTest/qtestdata.h"}, + { "QTestEventLoop", "QtTest/qtesteventloop.h"}, + { "QTextCodec", "QtCore/qtextcodec.h"}, + { "ConverterState", "QtCore/qtextcodec.h"}, + { "QTextEncoder", "QtCore/qtextcodec.h"}, + { "QTextDecoder", "QtCore/qtextcodec.h"}, + { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"}, + { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"}, + { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"}, + { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"}, + { "Exception", "QtCore/qtconcurrentexception.h"}, + { "UnhandledException", "QtCore/qtconcurrentexception.h"}, + { "ExceptionStore", "QtCore/qtconcurrentexception.h"}, + { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"}, + { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"}, + { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"}, + { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"}, + { "QThreadPool", "QtCore/qthreadpool.h"}, + { "QBitArray", "QtCore/qbitarray.h"}, + { "QBitRef", "QtCore/qbitarray.h"}, + { "QByteArray", "QtCore/qbytearray.h"}, + { "QByteRef", "QtCore/qbytearray.h"}, + { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"}, + { "QChar", "QtCore/qchar.h"}, + { "QCommandLineOption", "QtCore/qcommandlineoption.h"}, + { "QCommandLineParser", "QtCore/qcommandlineparser.h"}, + { "QContiguousCacheData", "QtCore/qcontiguouscache.h"}, + { "QCryptographicHash", "QtCore/qcryptographichash.h"}, + { "QDate", "QtCore/qdatetime.h"}, + { "QTime", "QtCore/qdatetime.h"}, + { "QDateTime", "QtCore/qdatetime.h"}, + { "QEasingCurve", "QtCore/qeasingcurve.h"}, + { "QElapsedTimer", "QtCore/qelapsedtimer.h"}, + { "QHashData", "QtCore/qhash.h"}, + { "QLine", "QtCore/qline.h"}, + { "QLineF", "QtCore/qline.h"}, + { "QLinkedListData", "QtCore/qlinkedlist.h"}, + { "QListData", "QtCore/qlist.h"}, + { "QSystemLocale", "QtCore/qlocale.h"}, + { "QLocale", "QtCore/qlocale.h"}, + { "QMapData", "QtCore/qmap.h"}, + { "QPoint", "QtCore/qpoint.h"}, + { "QPointF", "QtCore/qpoint.h"}, + { "QRect", "QtCore/qrect.h"}, + { "QRectF", "QtCore/qrect.h"}, + { "QRegExp", "QtCore/qregexp.h"}, + { "QSharedData", "QtCore/qshareddata.h"}, + { "QSize", "QtCore/qsize.h"}, + { "QSizeF", "QtCore/qsize.h"}, + { "QString", "QtCore/qstring.h"}, + { "QLatin1String", "QtCore/qstring.h"}, + { "QCharRef", "QtCore/qstring.h"}, + { "QStringRef", "QtCore/qstring.h"}, + { "QStringList", "QtCore/qstringlist.h"}, + { "QStringMatcher", "QtCore/qstringmatcher.h"}, + { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"}, + { "QTimeLine", "QtCore/qtimeline.h"}, + { "QVectorData", "QtCore/qvector.h"}, + { "QAtomicInt", "QtCore/qatomic.h"}, + { "QAtomicPointer", "QtCore/qatomic.h"}, + { "QMutex", "QtCore/qmutex.h"}, + { "QMutexLocker", "QtCore/qmutex.h"}, + { "QReadWriteLock", "QtCore/qreadwritelock.h"}, + { "QReadLocker", "QtCore/qreadwritelock.h"}, + { "QWriteLocker", "QtCore/qreadwritelock.h"}, + { "QSemaphore", "QtCore/qsemaphore.h"}, + { "QThread", "QtCore/qthread.h"}, + { "QWaitCondition", "QtCore/qwaitcondition.h"}, + { "QFactoryInterface", "QtCore/qfactoryinterface.h"}, + { "QLibrary", "QtCore/qlibrary.h"}, + { "QPluginLoader", "QtCore/qpluginloader.h"}, + { "QUuid", "QtCore/quuid.h"}, + { "QLibraryInfo", "QtCore/qlibraryinfo.h"}, + { "QInternal", "QtCore/qnamespace.h"}, + { "QJsonArray", "QtCore/qjsonarray.h"}, + { "QJsonParseError", "QtCore/qjsondocument.h"}, + { "QJsonDocument", "QtCore/qjsondocument.h"}, + { "QJsonObject", "QtCore/qjsonobject.h"}, + { "QJsonValue", "QtCore/qjsonvalue.h"}, + { "QJsonValueRef", "QtCore/qjsonvalue.h"}, + { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"}, + { "QJsonValuePtr", "QtCore/qjsonvalue.h"}, + { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"}, + { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"}, + { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"}, + { "QBuffer", "QtCore/qbuffer.h"}, + { "QDataStream", "QtCore/qdatastream.h"}, + { "QDebug", "QtCore/qdebug.h"}, + { "QDir", "QtCore/qdir.h"}, + { "QDirIterator", "QtCore/qdiriterator.h"}, + { "QFile", "QtCore/qfile.h"}, + { "QFileInfo", "QtCore/qfileinfo.h"}, + { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"}, + { "QFSFileEngine", "QtCore/qfsfileengine.h"}, + { "QIODevice", "QtCore/qiodevice.h"}, + { "QProcessEnvironment", "QtCore/qprocess.h"}, + { "QProcess", "QtCore/qprocess.h"}, + { "QResource", "QtCore/qresource.h"}, + { "QSettings", "QtCore/qsettings.h"}, + { "QStandardPaths", "QtCore/qstandardpaths.h"}, + { "QTemporaryFile", "QtCore/qtemporaryfile.h"}, + { "QTextStream", "QtCore/qtextstream.h"}, + { "QTextStreamManipulator", "QtCore/qtextstream.h"}, + { "QUrl", "QtCore/qurl.h"}, + { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"}, + { "QModelIndex", "QtCore/qabstractitemmodel.h"}, + { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"}, + { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"}, + { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"}, + { "QAbstractListModel", "QtCore/qabstractitemmodel.h"}, + { "QBasicTimer", "QtCore/qbasictimer.h"}, + { "QCoreApplication", "QtCore/qcoreapplication.h"}, + { "QEvent", "QtCore/qcoreevent.h"}, + { "QTimerEvent", "QtCore/qcoreevent.h"}, + { "QChildEvent", "QtCore/qcoreevent.h"}, + { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"}, + { "QEventLoop", "QtCore/qeventloop.h"}, + { "QMetaMethod", "QtCore/qmetaobject.h"}, + { "QMetaEnum", "QtCore/qmetaobject.h"}, + { "QMetaProperty", "QtCore/qmetaobject.h"}, + { "QMetaClassInfo", "QtCore/qmetaobject.h"}, + { "QMetaType", "QtCore/qmetatype.h"}, + { "QMimeData", "QtCore/qmimedata.h"}, + { "QObject", "QtCore/qobject.h"}, + { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"}, + { "QGenericArgument", "QtCore/qobjectdefs.h"}, + { "QGenericReturnArgument", "QtCore/qobjectdefs.h"}, + { "QMetaObject", "QtCore/qobjectdefs.h"}, + { "QSharedMemory", "QtCore/qsharedmemory.h"}, + { "QSignalMapper", "QtCore/qsignalmapper.h"}, + { "QSocketNotifier", "QtCore/qsocketnotifier.h"}, + { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"}, + { "QTimer", "QtCore/qtimer.h"}, + { "QTranslator", "QtCore/qtranslator.h"}, + { "QVariant", "QtCore/qvariant.h"}, + { "QDesignerComponents", "QtDesigner/qdesigner_components.h"}, + { "ActionProviderBase", "QtDesigner/default_actionprovider.h"}, + { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"}, + { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"}, + { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"}, + { "FormEditor", "QtDesigner/formeditor.h"}, + { "FormWindow", "QtDesigner/formwindow.h"}, + { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"}, + { "FormWindowCursor", "QtDesigner/formwindowcursor.h"}, + { "FormWindowManager", "QtDesigner/formwindowmanager.h"}, + { "IconCache", "QtDesigner/iconcache.h"}, + { "QDesignerResource", "QtDesigner/qdesigner_resource.h"}, + { "QtBrushManager", "QtDesigner/qtbrushmanager.h"}, + { "WidgetHandle", "QtDesigner/widgetselection.h"}, + { "WidgetSelection", "QtDesigner/widgetselection.h"}, + { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"}, + { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"}, + { "PropertyEditor", "QtDesigner/propertyeditor.h"}, + { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"}, + { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"}, + { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"}, + { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"}, + { "ObjectInspector", "QtDesigner/objectinspector.h"}, + { "WidgetBox", "QtDesigner/widgetbox.h"}, + { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"}, + { "BuddyEditor", "QtDesigner/buddyeditor.h"}, + { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"}, + { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"}, + { "TabOrderEditor", "QtDesigner/tabordereditor.h"}, + { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"}, + { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"}, + { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"}, + { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"}, + { "QExtensionManager", "QtDesigner/qextensionmanager.h"}, + { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"}, { "QDBusAbstractAdaptor", "QtDBus/qdbusabstractadaptor.h"}, { "QDBusAbstractInterfaceBase", "QtDBus/qdbusabstractinterface.h"}, { "QDBusAbstractInterface", "QtDBus/qdbusabstractinterface.h"}, @@ -542,80 +680,6 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QDeclarativeItem", "QtDeclarative/qdeclarativeitem.h"}, { "QDeclarativePropertyMap", "QtDeclarative/qdeclarativepropertymap.h"}, { "QDeclarativeView", "QtDeclarative/qdeclarativeview.h"}, - { "QDesignerComponents", "QtDesigner/qdesigner_components.h"}, - { "ActionProviderBase", "QtDesigner/default_actionprovider.h"}, - { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"}, - { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"}, - { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"}, - { "FormEditor", "QtDesigner/formeditor.h"}, - { "FormWindow", "QtDesigner/formwindow.h"}, - { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"}, - { "FormWindowCursor", "QtDesigner/formwindowcursor.h"}, - { "FormWindowManager", "QtDesigner/formwindowmanager.h"}, - { "IconCache", "QtDesigner/iconcache.h"}, - { "QDesignerResource", "QtDesigner/qdesigner_resource.h"}, - { "QtBrushManager", "QtDesigner/qtbrushmanager.h"}, - { "WidgetHandle", "QtDesigner/widgetselection.h"}, - { "WidgetSelection", "QtDesigner/widgetselection.h"}, - { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"}, - { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"}, - { "PropertyEditor", "QtDesigner/propertyeditor.h"}, - { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"}, - { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"}, - { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"}, - { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"}, - { "ObjectInspector", "QtDesigner/objectinspector.h"}, - { "WidgetBox", "QtDesigner/widgetbox.h"}, - { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"}, - { "BuddyEditor", "QtDesigner/buddyeditor.h"}, - { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"}, - { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"}, - { "TabOrderEditor", "QtDesigner/tabordereditor.h"}, - { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"}, - { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"}, - { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"}, - { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"}, - { "QExtensionManager", "QtDesigner/qextensionmanager.h"}, - { "QAbstractSocket", "QtNetwork/qabstractsocket.h"}, - { "QLocalServer", "QtNetwork/qlocalserver.h"}, - { "QLocalSocket", "QtNetwork/qlocalsocket.h"}, - { "QTcpServer", "QtNetwork/qtcpserver.h"}, - { "QTcpSocket", "QtNetwork/qtcpsocket.h"}, - { "QUdpSocket", "QtNetwork/qudpsocket.h"}, - { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"}, - { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"}, - { "QNetworkSession", "QtNetwork/qnetworksession.h"}, - { "QAuthenticator", "QtNetwork/qauthenticator.h"}, - { "QIPv6Address", "QtNetwork/qhostaddress.h"}, - { "QHostAddress", "QtNetwork/qhostaddress.h"}, - { "QHostInfo", "QtNetwork/qhostinfo.h"}, - { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"}, - { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"}, - { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"}, - { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"}, - { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"}, - { "QUrlInfo", "QtNetwork/qurlinfo.h"}, - { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"}, - { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"}, - { "QFtp", "QtNetwork/qftp.h"}, - { "QHttpHeader", "QtNetwork/qhttp.h"}, - { "QHttpResponseHeader", "QtNetwork/qhttp.h"}, - { "QHttpRequestHeader", "QtNetwork/qhttp.h"}, - { "QHttp", "QtNetwork/qhttp.h"}, - { "QHttpPart", "QtNetwork/qhttpmultipart.h"}, - { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"}, - { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"}, - { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"}, - { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"}, - { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"}, - { "QNetworkReply", "QtNetwork/qnetworkreply.h"}, - { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"}, - { "QSslCertificate", "QtNetwork/qsslcertificate.h"}, - { "QSslCipher", "QtNetwork/qsslcipher.h"}, - { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"}, - { "QSslError", "QtNetwork/qsslerror.h"}, - { "QSslKey", "QtNetwork/qsslkey.h"}, - { "QSslSocket", "QtNetwork/qsslsocket.h"}, { "QSqlQueryModel", "QtSql/qsqlquerymodel.h"}, { "QSqlRelation", "QtSql/qsqlrelationaltablemodel.h"}, { "QSqlRelationalTableModel", "QtSql/qsqlrelationaltablemodel.h"}, @@ -631,70 +695,6 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QSqlQuery", "QtSql/qsqlquery.h"}, { "QSqlRecord", "QtSql/qsqlrecord.h"}, { "QSqlResult", "QtSql/qsqlresult.h"}, - { "QGraphicsSvgItem", "QtSvg/qgraphicssvgitem.h"}, - { "QSvgGenerator", "QtSvg/qsvggenerator.h"}, - { "QSvgRenderer", "QtSvg/qsvgrenderer.h"}, - { "QSvgWidget", "QtSvg/qsvgwidget.h"}, - { "QDomImplementation", "QtXml/qdom.h"}, - { "QDomNode", "QtXml/qdom.h"}, - { "QDomNodeList", "QtXml/qdom.h"}, - { "QDomDocumentType", "QtXml/qdom.h"}, - { "QDomDocument", "QtXml/qdom.h"}, - { "QDomNamedNodeMap", "QtXml/qdom.h"}, - { "QDomDocumentFragment", "QtXml/qdom.h"}, - { "QDomCharacterData", "QtXml/qdom.h"}, - { "QDomAttr", "QtXml/qdom.h"}, - { "QDomElement", "QtXml/qdom.h"}, - { "QDomText", "QtXml/qdom.h"}, - { "QDomComment", "QtXml/qdom.h"}, - { "QDomCDATASection", "QtXml/qdom.h"}, - { "QDomNotation", "QtXml/qdom.h"}, - { "QDomEntity", "QtXml/qdom.h"}, - { "QDomEntityReference", "QtXml/qdom.h"}, - { "QDomProcessingInstruction", "QtXml/qdom.h"}, - { "QXmlNamespaceSupport", "QtXml/qxml.h"}, - { "QXmlAttributes", "QtXml/qxml.h"}, - { "QXmlInputSource", "QtXml/qxml.h"}, - { "QXmlParseException", "QtXml/qxml.h"}, - { "QXmlReader", "QtXml/qxml.h"}, - { "QXmlSimpleReader", "QtXml/qxml.h"}, - { "QXmlLocator", "QtXml/qxml.h"}, - { "QXmlContentHandler", "QtXml/qxml.h"}, - { "QXmlErrorHandler", "QtXml/qxml.h"}, - { "QXmlDTDHandler", "QtXml/qxml.h"}, - { "QXmlEntityResolver", "QtXml/qxml.h"}, - { "QXmlLexicalHandler", "QtXml/qxml.h"}, - { "QXmlDeclHandler", "QtXml/qxml.h"}, - { "QXmlDefaultHandler", "QtXml/qxml.h"}, - { "QXmlStreamAttribute", "QtXml/qxmlstream.h"}, - { "QXmlStreamAttributes", "QtXml/qxmlstream.h"}, - { "QXmlStreamNamespaceDeclaration", "QtXml/qxmlstream.h"}, - { "QXmlStreamNotationDeclaration", "QtXml/qxmlstream.h"}, - { "QXmlStreamEntityDeclaration", "QtXml/qxmlstream.h"}, - { "QXmlStreamEntityResolver", "QtXml/qxmlstream.h"}, - { "QXmlStreamReader", "QtXml/qxmlstream.h"}, - { "QXmlStreamWriter", "QtXml/qxmlstream.h"}, - { "QScriptable", "QtScript/qscriptable.h"}, - { "QScriptClass", "QtScript/qscriptclass.h"}, - { "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"}, - { "QScriptContext", "QtScript/qscriptcontext.h"}, - { "QScriptContextInfo", "QtScript/qscriptcontextinfo.h"}, - { "QScriptSyntaxCheckResult", "QtScript/qscriptengine.h"}, - { "QScriptEngine", "QtScript/qscriptengine.h"}, - { "QScriptEngineAgent", "QtScript/qscriptengineagent.h"}, - { "QScriptExtensionInterface", "QtScript/qscriptextensioninterface.h"}, - { "QScriptExtensionPlugin", "QtScript/qscriptextensionplugin.h"}, - { "QScriptProgram", "QtScript/qscriptprogram.h"}, - { "QScriptString", "QtScript/qscriptstring.h"}, - { "QScriptValue", "QtScript/qscriptvalue.h"}, - { "QScriptValueIterator", "QtScript/qscriptvalueiterator.h"}, - { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"}, - { "QBenchmarkIterationController", "QtTest/qbenchmark.h"}, - { "QTestData", "QtTest/qtestdata.h"}, - { "QTestEventLoop", "QtTest/qtesteventloop.h"}, - { "QAbstractFormBuilder", "QtUiTools/abstractformbuilder.h"}, - { "QFormBuilder", "QtUiTools/formbuilder.h"}, - { "QUiLoader", "QtUiTools/quiloader.h"}, }; static const int qclass_lib_count = 690; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3b644599f..4185e43c0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,6 +35,9 @@ include_directories( ${CMAKE_BINARY_DIR}/privateinclude/QtUiTools ) +# FIXME: most tests are not namespaces aware +add_definitions(-DQT_NAMESPACE_COMPAT) + file(GLOB_RECURSE CMAKEFILES "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt") foreach(cmakefile ${CMAKEFILES}) get_filename_component(dirname ${cmakefile} PATH) diff --git a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp index 9c03cfc0f..ba8bec463 100644 --- a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp +++ b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp @@ -42,6 +42,8 @@ #include #include +QT_USE_NAMESPACE + int main(int argc, char** argv) { QCoreApplication app(argc, argv); diff --git a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt index 3ddc47381..83bb4c5b2 100644 --- a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt +++ b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt @@ -1,4 +1,4 @@ -katie_test(tst_bench_qanimation +katie_gui_test(tst_bench_qanimation ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dummyobject.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dummyanimation.cpp diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt.broken b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt.broken index 01fa3a4fc..d2a46d71b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt.broken +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt.broken @@ -1,4 +1,4 @@ -katie_test(tst_GraphicsViewBenchmark +katie_gui_test(tst_GraphicsViewBenchmark ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/widgets/gvbwidget.cpp ${CMAKE_CURRENT_SOURCE_DIR}/widgets/abstractscrollarea.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index f9bc9c776..e38a95fc7 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicsanchorlayout +katie_gui_test(tst_bench_qgraphicsanchorlayout ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsanchorlayout.cpp ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicsitem/CMakeLists.txt index 8996e0129..42ffb4cc3 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicsitem +katie_gui_test(tst_bench_qgraphicsitem ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsitem.cpp ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicslayout/CMakeLists.txt index d7e7549ad..7b4b74ee3 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicslayout/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicslayout +katie_gui_test(tst_bench_qgraphicslayout ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicslayout.cpp ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/CMakeLists.txt index b59845761..d12604548 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicslinearlayout +katie_gui_test(tst_bench_qgraphicslinearlayout ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicslinearlayout.cpp ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicsscene/CMakeLists.txt index e3977b27f..df574b3ac 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicsscene +katie_gui_test(tst_bench_qgraphicsscene ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicsscene.cpp ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt index 16aabf118..c6edf51b8 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt @@ -1,4 +1,4 @@ -katie_test(tst_bench_qgraphicsview +katie_gui_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 diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicswidget/CMakeLists.txt index 9df99563e..9dd276ce3 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qgraphicswidget +katie_gui_test(tst_bench_qgraphicswidget ${CMAKE_CURRENT_SOURCE_DIR}/tst_qgraphicswidget.cpp ) diff --git a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt index c88ff934a..eaa279c14 100644 --- a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt +++ b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_blendbench +katie_gui_test(tst_bench_blendbench ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt index a0203324a..2480c658e 100644 --- a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt @@ -1,15 +1,3 @@ -katie_test(tst_bench_imageConversion +katie_gui_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() diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt index 527cbb7de..b4b31f2eb 100644 --- a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt @@ -1,4 +1,4 @@ -katie_test(tst_bench_qimagereader +katie_gui_test(tst_bench_qimagereader ${CMAKE_CURRENT_SOURCE_DIR}/tst_qimagereader.cpp ) diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt index 515e10903..b1c90a206 100644 --- a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qpixmap +katie_gui_test(tst_bench_qpixmap ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpixmap.cpp ) diff --git a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt index 23eeccaab..2420a9f4d 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qpixmapcache +katie_gui_test(tst_bench_qpixmapcache ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpixmapcache.cpp ) diff --git a/tests/benchmarks/gui/itemviews/qtableview/CMakeLists.txt b/tests/benchmarks/gui/itemviews/qtableview/CMakeLists.txt index 4caadb7c6..c8cbbfa9a 100644 --- a/tests/benchmarks/gui/itemviews/qtableview/CMakeLists.txt +++ b/tests/benchmarks/gui/itemviews/qtableview/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qtableview +katie_gui_test(tst_bench_qtableview ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtableview.cpp ) diff --git a/tests/benchmarks/gui/kernel/qapplication/CMakeLists.txt b/tests/benchmarks/gui/kernel/qapplication/CMakeLists.txt index 4440a14fd..b3cdd0583 100644 --- a/tests/benchmarks/gui/kernel/qapplication/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qapplication/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qapplication +katie_gui_test(tst_bench_qapplication ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt index 66609ba0c..f0395181d 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qguimetatype +katie_gui_test(tst_bench_qguimetatype ${CMAKE_CURRENT_SOURCE_DIR}/tst_qguimetatype.cpp ) diff --git a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt index f6980573b..e383e31dd 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qguivariant +katie_gui_test(tst_bench_qguivariant ${CMAKE_CURRENT_SOURCE_DIR}/tst_qguivariant.cpp ) diff --git a/tests/benchmarks/gui/kernel/qwidget/CMakeLists.txt b/tests/benchmarks/gui/kernel/qwidget/CMakeLists.txt index 54168497a..37565b873 100644 --- a/tests/benchmarks/gui/kernel/qwidget/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qwidget/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qwidget +katie_gui_test(tst_bench_qwidget ${CMAKE_CURRENT_SOURCE_DIR}/tst_qwidget.cpp ) diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt index c84499590..fe041841a 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qmatrix4x4 +katie_gui_test(tst_bench_qmatrix4x4 ${CMAKE_CURRENT_SOURCE_DIR}/tst_qmatrix4x4.cpp ) diff --git a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt index ec1371642..4db5b64d3 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qquaternion +katie_gui_test(tst_bench_qquaternion ${CMAKE_CURRENT_SOURCE_DIR}/tst_qquaternion.cpp ) diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt index 549b810dd..337ced5c0 100644 --- a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qpainter +katie_gui_test(tst_bench_qpainter ${CMAKE_CURRENT_SOURCE_DIR}/tst_qpainter.cpp ) diff --git a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt index 5622fd50c..59e20903a 100644 --- a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qregion +katie_gui_test(tst_bench_qregion ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt index abd9b38e3..92c941900 100644 --- a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_qtbench +katie_gui_test(tst_qtbench ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtbench.cpp ) diff --git a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt index 540cdc6b2..dda3a6fb4 100644 --- a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qtransform +katie_gui_test(tst_bench_qtransform ${CMAKE_CURRENT_SOURCE_DIR}/tst_qtransform.cpp ) diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/CMakeLists.txt b/tests/benchmarks/gui/styles/qstylesheetstyle/CMakeLists.txt index d111c6344..095d541f9 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_qstylesheetstyle +katie_gui_test(tst_bench_qstylesheetstyle ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt index 24a3adda2..79241d14a 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_QFontMetrics +katie_gui_test(tst_bench_QFontMetrics ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt index d966079b1..36c801792 100644 --- a/tests/benchmarks/gui/text/qtext/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt @@ -1,3 +1,3 @@ -katie_test(tst_bench_QText +katie_gui_test(tst_bench_QText ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt index f6247ac6a..e12f6fca4 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt @@ -2,4 +2,4 @@ katie_test(tst_bench_qnetworkdiskcache ${CMAKE_CURRENT_SOURCE_DIR}/tst_qnetworkdiskcache.cpp ) -target_link_libraries(tst_bench_qnetworkdiskcache KtNetwork) +target_link_libraries(tst_bench_qnetworkdiskcache KtNetwork KtGui) diff --git a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp index 8ce6b764d..dc36122c0 100644 --- a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp +++ b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp @@ -41,6 +41,7 @@ #include #include +#include Q_DECLARE_METATYPE(QScriptContext*) Q_DECLARE_METATYPE(QScriptValue) diff --git a/tests/benchmarks/script/qscriptqobject/CMakeLists.txt b/tests/benchmarks/script/qscriptqobject/CMakeLists.txt index cadf5a390..896a70e0f 100644 --- a/tests/benchmarks/script/qscriptqobject/CMakeLists.txt +++ b/tests/benchmarks/script/qscriptqobject/CMakeLists.txt @@ -1,4 +1,4 @@ -katie_test(tst_bench_qscriptqobject +katie_gui_test(tst_bench_qscriptqobject ${CMAKE_CURRENT_SOURCE_DIR}/tst_qscriptqobject.cpp )