diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:37 +0200 |
| commit | d099a75653713e79318d538ef32d49f989d5e74c (patch) | |
| tree | 5d100bcf00ea5205eb5cdf18490052570057416b | |
| parent | cfc16c6154e4f71eecd15aeb0cb62d8247aac186 (diff) | |
| parent | 52d8b58c05aa234848c94758d6beddc0a793e6b4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b
| -rw-r--r-- | tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index 905bb1c1..14a09d96 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -170,7 +170,7 @@ QString tst_qmlvisual::toTestScript(const QString &file, Mode mode) return QString(); const char* platformsuffix=0; // platforms with different fonts -#if defined(Q_OS_MACX) +#if defined(Q_OS_OSX) platformsuffix = "-MAC"; #elif defined(Q_OS_WIN) platformsuffix = "-WIN"; |