AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qapplication: Fix auto test for configs with builtin_testdata

Browse Source 
Change-Id: Ie5b4dad19387c18e0d11d44b9b1a735269ec5e04
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Oliver Wolff 2018-05-17 15:23:03 +02:00
parent 2d37360e01
commit de0a210eb0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/widgets/kernel/qapplication/test/test.pro
View File

@ -7,7 +7,9 @@ QT += core-private gui-private
SOURCES += ../tst_qapplication.cpp SOURCES += ../tst_qapplication.cpp
TARGET = ../tst_qapplication TARGET = ../tst_qapplication
TESTDATA = ../test/test.pro ../tmp/README builtin_testdata: DEFINES += BUILTIN_TESTDATA
TESTDATA = ../test/test.pro ../tmp/README ../modal
!winrt { !winrt {
SUBPROGRAMS = desktopsettingsaware modal SUBPROGRAMS = desktopsettingsaware modal

4
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -888,7 +888,11 @@ bool isPathListIncluded(const QStringList &l, const QStringList &r)
#define QT_TST_QAPP_DEBUG #define QT_TST_QAPP_DEBUG
void tst_QApplication::libraryPaths() void tst_QApplication::libraryPaths()
{ {
#ifndef BUILTIN_TESTDATA
const QString testDir = QFileInfo(QFINDTESTDATA("test/test.pro")).absolutePath(); const QString testDir = QFileInfo(QFINDTESTDATA("test/test.pro")).absolutePath();
#else
const QString testDir = QFileInfo(QFINDTESTDATA("test.pro")).absolutePath();
#endif
QVERIFY(!testDir.isEmpty()); QVERIFY(!testDir.isEmpty());
{ {
QApplication::setLibraryPaths(QStringList() << testDir); QApplication::setLibraryPaths(QStringList() << testDir);