diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 10:07:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 10:07:26 (GMT) |
| commit | 68cf12a907c4fbc918019dad2c2a845466d15a30 (patch) | |
| tree | 0adafc6d8ec233683579a66097b38116722f9f4b /tests/auto/uic3/tst_uic3.cpp | |
| parent | dadb7b7ad36c43757d96b540b40cc3d81dca69d2 (diff) | |
| parent | c39436c722e778460366995877d66a8935d2d636 (diff) | |
| download | Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.zip Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.tar.gz Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.tar.bz2 | |
Merge branch '4.5'
Conflicts:
configure
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/uic3/tst_uic3.cpp')
| -rw-r--r-- | tests/auto/uic3/tst_uic3.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp index 67011fa..5c6c6bf 100644 --- a/tests/auto/uic3/tst_uic3.cpp +++ b/tests/auto/uic3/tst_uic3.cpp @@ -45,6 +45,7 @@ #include <QtCore/QProcess> #include <QtCore/QByteArray> #include <QtCore/QString> +#include <QtCore/QLibraryInfo> #ifndef Q_OS_WINCE @@ -72,7 +73,7 @@ private: tst_uic3::tst_uic3() : uic3Exists(true) - , command(QLatin1String("uic3")) + , command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic3")) { } @@ -183,7 +184,7 @@ QString tst_uic3::workingDir() const return QDir::cleanPath(SRCDIR); } -QTEST_MAIN(tst_uic3) +QTEST_APPLESS_MAIN(tst_uic3) #include "tst_uic3.moc" #else QTEST_NOOP_MAIN |