diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-18 11:40:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 09:45:49 +0200 |
| commit | 8a711623a8e913ab547873ebce028c508d39fdbf (patch) | |
| tree | e458183fc6ed3a52a90ab68e0f5704f4baead9b0 /tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | |
| parent | 82216d2b20a61cacd07efa394a124e0d9101dd6b (diff) | |
QtQuick1: Fix qdeclarativefontloader test.
- Base it on QDeclarativeDataTest, getting rid
of the SRCDIR defines.
- Remove Symbian part.
- Specify local file font URL correctly.
- Remaining tests were fixed by qtbase:
4f1820e3a77b3fdda32a1b935502b187e73059cf
(Implement application font loading for Windows)
Task-number: QTBUG-24475
Change-Id: If04f4bc024f106ad14de1904b2f17ec0cc175962
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index f4537efe..5c4cb98f 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -7,15 +7,5 @@ macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativefontloader.cpp ../shared/testhttpserver.cpp - -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} - +include(../shared/qdeclarativedatatest.pri) CONFIG += parallel_test - -win32:CONFIG += insignificant_test # QTBUG-24475 |