diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 12:07:26 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 12:07:26 +0200 |
| commit | 68cf12a907c4fbc918019dad2c2a845466d15a30 (patch) | |
| tree | 0adafc6d8ec233683579a66097b38116722f9f4b /tests/auto/moc | |
| parent | dadb7b7ad36c43757d96b540b40cc3d81dca69d2 (diff) | |
| parent | c39436c722e778460366995877d66a8935d2d636 (diff) | |
Merge branch '4.5'
Conflicts:
configure
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/moc')
| -rw-r--r-- | tests/auto/moc/tst_moc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 488f068e20..8374cd7e68 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -1209,7 +1209,7 @@ void tst_Moc::warnOnVirtualSignal() #endif } -QTEST_MAIN(tst_Moc) +QTEST_APPLESS_MAIN(tst_Moc) #include "tst_moc.moc" |